diff options
| author | Mans Rullgard <mans@mansr.com> | 2012-05-30 04:04:54 +0100 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2012-06-10 09:54:22 +0200 |
| commit | b102d5d97daedb717c023ec7bfa43047d97de284 (patch) | |
| tree | 85045fd52b3756358821afe63c692851f464125d /libavcodec/xiph.c | |
| parent | b61e311b0eeabaab8eb05f4e5e5c6c8c9d84f3cf (diff) | |
| download | ffmpeg-b102d5d97daedb717c023ec7bfa43047d97de284.tar.gz | |
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>
Diffstat (limited to 'libavcodec/xiph.c')
0 files changed, 0 insertions, 0 deletions