mov: set AVCodecContext.width/height for h264
authorMans Rullgard <mans@mansr.com>
Wed, 30 May 2012 03:06:00 +0000 (04:06 +0100)
committerReinhard Tartler <siretart@tauware.de>
Sun, 10 Jun 2012 09:22:57 +0000 (11:22 +0200)
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>
libavformat/mov.c

index f6be6a8..1dbf63f 100644 (file)
@@ -1995,9 +1995,6 @@ static int mov_read_trak(MOVContext *c, AVIOContext *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