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. /Joakim