more msmpeg4 fourccs patch by Gert Vervoort <Gert.Vervoort@wxs.nl>

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

libav/asf.c

@@ -131,8 +131,10 @@ CodecTag codec_asf_bmp_tags[] = {
     { CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', 'X') },
     { CODEC_ID_MPEG4, MKTAG('d', 'i', 'v', 'x') },
     { CODEC_ID_MPEG4, MKTAG(0x04, 0, 0, 0) }, /* some broken avi use this */
-    { CODEC_ID_MSMPEG4, MKTAG('M', 'P', '4', '3') }, /* default signature when using MSMPEG4 */
-    { CODEC_ID_MSMPEG4, MKTAG('D', 'I', 'V', '3') }, 
+    { 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') }, 
     { 0, 0 },
 };
 

libav/avienc.c

@@ -63,8 +63,10 @@ CodecTag codec_bmp_tags[] = {
     { CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', 'X') },
     { CODEC_ID_MPEG4, MKTAG('d', 'i', 'v', 'x') },
     { CODEC_ID_MPEG4, MKTAG(0x04, 0, 0, 0) }, /* some broken avi use this */
-    { CODEC_ID_MSMPEG4, MKTAG('D', 'I', 'V', '3') }, /* default signature when using MSMPEG4 */
-    { CODEC_ID_MSMPEG4, MKTAG('M', 'P', '4', '3') }, 
+    { 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') }, 
     { 0, 0 },
 };