wmv1

Originally committed as revision 698 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libav/asf.c b/libav/asf.c
index 8dac626..e1e49e3 100644 (file)
--- a/libav/asf.c
+++ b/libav/asf.c
@@ -137,7 +137,8 @@ CodecTag codec_asf_bmp_tags[] = {
     { CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', '4', '3') }, /* default signature when using MSMPEG4 */ 
     { CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '3') },
     { CODEC_ID_MSMPEG4V2, MKTAG('M', 'P', '4', '2') }, 
-    { CODEC_ID_MSMPEG4V1, MKTAG('M', 'P', '4', '1') }, 
+    { CODEC_ID_MSMPEG4V1, MKTAG('M', 'P', 'G', '4') }, 
+    { CODEC_ID_WMV1, MKTAG('W', 'M', 'V', '1') }, 
     { 0, 0 },
 };
 

diff --git a/libav/avienc.c b/libav/avienc.c
index 94e4be1..0539b54 100644 (file)
--- a/libav/avienc.c
+++ b/libav/avienc.c
@@ -66,7 +66,8 @@ CodecTag codec_bmp_tags[] = {
     { CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '3') }, /* default signature when using MSMPEG4 */
     { CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', '4', '3') }, 
     { CODEC_ID_MSMPEG4V2, MKTAG('M', 'P', '4', '2') }, 
-    { CODEC_ID_MSMPEG4V1, MKTAG('M', 'P', '4', '1') }, 
+    { CODEC_ID_MSMPEG4V1, MKTAG('M', 'P', 'G', '4') }, 
+    { CODEC_ID_WMV1, MKTAG('W', 'M', 'V', '1') }, 
     { 0, 0 },
 };