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

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

more msmpeg4 fourccs patch by Gert Vervoort <Gert.Vervoort@wxs.nl>
Originally committed as revision 426 to svn://svn.ffmpeg.org/ffmpeg/trunk
bb3debab · Gert Vervoort · Michael Niedermayer · f94985d0 · bb3debab · bb3debab
Commit bb3debab authored Apr 29, 2002 by Gert Vervoort Committed by Michael Niedermayer Apr 29, 2002
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 4 deletions

asf.c libav/asf.c +4 -2

avienc.c libav/avienc.c +4 -2

No files found.
--- a/libav/asf.c
+++ b/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_MSMPEG4V3, MKTAG('M', 'P', '4', '3') }, /* default signature when using MSMPEG4 */ 
-    { CODEC_ID_MSMPEG4, MKTAG('D', 'I', 'V', '3') }, 
+    { 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 },
 };

--- a/libav/avienc.c
+++ b/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_MSMPEG4V3, MKTAG('D', 'I', 'V', '3') }, /* default signature when using MSMPEG4 */
-    { CODEC_ID_MSMPEG4, MKTAG('M', 'P', '4', '3') }, 
+    { 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 },
 };