[Ffmpeg-cvslog] CVS: ffmpeg/libavformat mov.c,1.80,1.81

[Michael Niedermayer CVS]

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

Modified Files:
	mov.c 
Log Message:
10l (overwriting w/h with 0)


Index: mov.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/mov.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- mov.c	19 May 2005 00:06:26 -0000	1.80
+++ mov.c	21 May 2005 02:06:45 -0000	1.81
@@ -840,16 +840,13 @@
             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 */