[SCM] libav/experimental: set width and height even for mpeg4, pix_fmt to NONE will force decoding anwyay

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 3cb4ee51245c806fd840f7ec32c7a3c50a808839
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Wed Apr 19 14:18:13 2006 +0000

    set width and height even for mpeg4, pix_fmt to NONE will force decoding anwyay
    
    Originally committed as revision 5303 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/mov.c b/libavformat/mov.c
index de60364..71043c6 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -967,13 +967,10 @@ 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 */
-            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 */
-            }
+
+            st->codec->width = get_be16(pb); /* width */
+            st->codec->height = get_be16(pb); /* height */
+
             get_be32(pb); /* horiz resolution */
             get_be32(pb); /* vert resolution */
             get_be32(pb); /* data size, always 0 */

-- 
Libav/FFmpeg packaging