[Ffmpeg-cvslog] CVS: ffmpeg/libavformat mov.c,1.143,1.144

[Baptiste Coudurier CVS]

Update of /cvsroot/ffmpeg/ffmpeg/libavformat
In directory mail:/var2/tmp/cvs-serv29736/libavformat

Modified Files:
	mov.c 
Log Message:
set width and height even for mpeg4, pix_fmt to NONE will force decoding anwyay

Index: mov.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/mov.c,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -d -r1.143 -r1.144
--- mov.c	19 Apr 2006 12:56:28 -0000	1.143
+++ mov.c	19 Apr 2006 14:18:13 -0000	1.144
@@ -967,13 +967,10 @@
             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 */