[SCM] libav/experimental: 10l (overwriting w/h with 0)

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit d57b7316c50c92b94f6e642dd3b54b0ad869265e
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sat May 21 02:06:45 2005 +0000

    10l (overwriting w/h with 0)
    
    Originally committed as revision 4289 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 88239f1..b6e1d36 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -840,16 +840,13 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
             get_be32(pb); /* vendor */
             get_be32(pb); /* temporal quality */
             get_be32(pb); /* spacial quality */
-            st->codec.width = get_be16(pb); /* width */
-            st->codec.height = get_be16(pb); /* height */
-#if 1
-            if (st->codec.codec_id == CODEC_ID_MPEG4) {
-                /* in some MPEG4 the width/height are not correct, so
-                   we ignore this info */
-                st->codec.width = 0;
-                st->codec.height = 0;
+            if(st->codec.codec_id == CODEC_ID_MPEG4){ //FIXME this is silly
+                get_be16(pb);
+                get_be16(pb);
+            }else{
+                st->codec.width = get_be16(pb); /* width */
+                st->codec.height = get_be16(pb); /* height */
             }
-#endif
             get_be32(pb); /* horiz resolution */
             get_be32(pb); /* vert resolution */
             get_be32(pb); /* data size, always 0 */

-- 
Libav/FFmpeg packaging