[SCM] libav/experimental: dont set width/height for h261/h263/mpeg4 since they are oftenly wrong, let decoder init them

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:50:12 UTC 2013


The following commit has been merged in the experimental branch:
commit d00f8e177145dfea67360b15183b55393e6eb7b7
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Thu Aug 24 09:09:20 2006 +0000

    dont set width/height for h261/h263/mpeg4 since they are oftenly wrong, let decoder init them
    
    Originally committed as revision 6069 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 10c2be3..1b8ef29 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1029,7 +1029,20 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
         st->codec->sample_rate= sc->time_scale;
     }
 
+    /* special codec parameters handling */
     switch (st->codec->codec_id) {
+#ifdef CONFIG_H261_DECODER
+    case CODEC_ID_H261:
+#endif
+#ifdef CONFIG_H263_DECODER
+    case CODEC_ID_H263:
+#endif
+#ifdef CONFIG_MPEG4_DECODER
+    case CODEC_ID_MPEG4:
+#endif
+        st->codec->width= 0; /* let decoder init width/height */
+        st->codec->height= 0;
+        break;
 #ifdef CONFIG_FAAD
     case CODEC_ID_AAC:
 #endif

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list