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:47:45 +0200 |
commit | e1608014c50eeb9f4744a53de0794eb6bb1269a2 (patch) | |
tree | 573448b93f4b412cb4f58e056cc11eb22a39a9ac /libavformat/matroskadec.c | |
parent | ce39a84a7d760965972781df61a88e5f432b978a (diff) | |
download | ffmpeg-e1608014c50eeb9f4744a53de0794eb6bb1269a2.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
Diffstat (limited to 'libavformat/matroskadec.c')
0 files changed, 0 insertions, 0 deletions