h264: allow cropping to AVCodecContext.width/height
authorMans Rullgard <mans@mansr.com>
Wed, 30 May 2012 03:04:54 +0000 (04:04 +0100)
committerReinhard Tartler <siretart@tauware.de>
Sun, 10 Jun 2012 07:54:22 +0000 (09:54 +0200)
commitb102d5d97daedb717c023ec7bfa43047d97de284
tree85045fd52b3756358821afe63c692851f464125d
parentb61e311b0eeabaab8eb05f4e5e5c6c8c9d84f3cf
h264: allow cropping to AVCodecContext.width/height

Override the frame size from the SPS with AVCodecContext values
if the latter specify a size smaller by less than one macroblock.
This is required for correct cropping of MOV files from Canon cameras.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 30f515091c323da59c0f1b533703dedca2f4b95d)

Conflicts:

libavcodec/h264.c
(cherry picked from commit e1608014c50eeb9f4744a53de0794eb6bb1269a2)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
libavcodec/h264.c