[Ffmpeg-cvslog] CVS: ffmpeg/libavformat asf.h, 1.65, 1.66 asf.c, 1.83, 1.84

[Michael Niedermayer CVS]

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

Modified Files:
	asf.h asf.c 
Log Message:
changes to ignore command media embedded in MS WMV files patch by ("Brown, Mike": mikeb, vibephone com)


Index: asf.h
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/asf.h,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- asf.h	23 Mar 2005 13:30:27 -0000	1.65
+++ asf.h	10 Aug 2005 23:41:20 -0000	1.66
@@ -165,6 +165,9 @@
     0x20FB5700, 0x5B55, 0x11CF, { 0xA8, 0xFD, 0x00, 0x80, 0x5F, 0x5C, 0x44, 0x2B },
 };
 
+static const GUID command_stream = {
+    0x59DACFC0, 0x59E6, 0x11D0, { 0xA3, 0xAC, 0x00, 0xA0, 0xC9, 0x03, 0x48, 0xF6 },
+};
 
 static const GUID comment_header = {
     0x75b22633, 0x668e, 0x11cf, { 0xa6, 0xd9, 0x00, 0xaa, 0x00, 0x62, 0xce, 0x6c },

Index: asf.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/asf.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- asf.c	27 Jul 2005 07:31:40 -0000	1.83
+++ asf.c	10 Aug 2005 23:41:20 -0000	1.84
@@ -51,6 +51,7 @@
     else PRINT_IF_GUID(g, audio_conceal_none);
     else PRINT_IF_GUID(g, video_stream);
     else PRINT_IF_GUID(g, video_conceal_none);
+    else PRINT_IF_GUID(g, command_stream);
     else PRINT_IF_GUID(g, comment_header);
     else PRINT_IF_GUID(g, codec_comment_header);
     else PRINT_IF_GUID(g, codec_comment1_header);
@@ -204,6 +205,8 @@
                 type = CODEC_TYPE_AUDIO;
             } else if (!memcmp(&g, &video_stream, sizeof(GUID))) {
                 type = CODEC_TYPE_VIDEO;
+            } else if (!memcmp(&g, &command_stream, sizeof(GUID))) {
+                type = CODEC_TYPE_UNKNOWN;
             } else {
                 goto fail;
             }