[FFmpeg-cvslog] h264: allow cropping to AVCodecContext.width/height

[Michael Niedermayer]

On Fri, Jan 18, 2013 at 11:13:01AM +0000, Joakim Plate wrote:
> Mans Rullgard <git <at> videolan.org> writes:
> 
> > h264: allow cropping to AVCodecContext.width/height
> > 
> > Conflicts:
> > 
> > 	libavcodec/h264.c
> 
> 
> It conflicted since it was already there. So should likely
> be reverted.

reverted

thanks

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

I have never wished to cater to the crowd; for what I know they do not
approve, and what they approve I do not know. -- Epicurus
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-cvslog/attachments/20130119/4f1e3ffe/attachment.asc>