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

[Baptiste Coudurier CVS]

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

Modified Files:
	mov.c 
Log Message:
skip null fourcc, fix ep2_mystery_m640_dummy.mov

Index: mov.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/mov.c,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -d -r1.144 -r1.145
--- mov.c	19 Apr 2006 14:18:13 -0000	1.144
+++ mov.c	1 May 2006 15:52:57 -0000	1.145
@@ -944,15 +944,11 @@
         get_be16(pb); /* reserved */
         get_be16(pb); /* index */
 
-        dprintf("size=%d 4CC= %c%c%c%c codec_type=%d\n",
-                size,
-                (format >> 0) & 0xff, (format >> 8) & 0xff, (format >> 16) & 0xff, (format >> 24) & 0xff,
-                st->codec->codec_type);
         st->codec->codec_tag = format;
         id = codec_get_id(mov_audio_tags, format);
         if (id > 0) {
             st->codec->codec_type = CODEC_TYPE_AUDIO;
-        } else if (format != MKTAG('m', 'p', '4', 's')) { /* skip old asf mpeg4 tag */
+        } else if (format && format != MKTAG('m', 'p', '4', 's')) { /* skip old asf mpeg4 tag */
             id = codec_get_id(mov_video_tags, format);
             if (id <= 0)
                 id = codec_get_id(codec_bmp_tags, format);
@@ -960,6 +956,11 @@
                 st->codec->codec_type = CODEC_TYPE_VIDEO;
         }
 
+        dprintf("size=%d 4CC= %c%c%c%c codec_type=%d\n",
+                size,
+                (format >> 0) & 0xff, (format >> 8) & 0xff, (format >> 16) & 0xff, (format >> 24) & 0xff,
+                st->codec->codec_type);
+
         if(st->codec->codec_type==CODEC_TYPE_VIDEO) {
             st->codec->codec_id = id;
             get_be16(pb); /* version */