diff options
| author | Mans Rullgard <mans@mansr.com> | 2012-05-30 04:06:00 +0100 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2012-06-10 11:24:14 +0200 |
| commit | 44e6cf3f75f00d201a8cb1b836251f5a826186a0 (patch) | |
| tree | 49dad296eba5745ffd98b65376e4df8d53571542 | |
| parent | 4eea330a2afa317940a11d5bf5461ba673ab6b67 (diff) | |
| download | ffmpeg-44e6cf3f75f00d201a8cb1b836251f5a826186a0.tar.gz | |
mov: set AVCodecContext.width/height for h264
This is required for correct cropping of files from Canon
cameras.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 8aa93e900449c88c3169ff5636fed03f41779cac)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit 2fb4be9a99a2c2a9435339830e3d940171cc0d9b)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit 0054d70f23edd1f61a10a1c2c687b3a04831feb9)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| -rw-r--r-- | libavformat/mov.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 2edd27e440..f1cde0b767 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1820,9 +1820,6 @@ static int mov_read_trak(MOVContext *c, ByteIOContext *pb, MOVAtom atom) #if CONFIG_H263_DECODER case CODEC_ID_H263: #endif -#if CONFIG_H264_DECODER - case CODEC_ID_H264: -#endif #if CONFIG_MPEG4_DECODER case CODEC_ID_MPEG4: #endif |