Make MP43 the default fourcc for msmpeg4v3:

DIV3 is not supported on default XP and Vista installations (MP43 is).

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

diff --git a/libavformat/riff.c b/libavformat/riff.c
index 17b47f0..137ea7c 100644 (file)
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -81,8 +81,8 @@ const AVCodecTag ff_codec_bmp_tags[] = {
     { CODEC_ID_MPEG4,        MKTAG('U', 'L', 'D', 'X') },
     { CODEC_ID_MPEG4,        MKTAG('G', 'E', 'O', 'V') },
     { CODEC_ID_MPEG4,        MKTAG('S', 'I', 'P', 'P') }, /* Samsung SHR-6040 */
-    { CODEC_ID_MSMPEG4V3,    MKTAG('D', 'I', 'V', '3') }, /* default signature when using MSMPEG4 */
     { CODEC_ID_MSMPEG4V3,    MKTAG('M', 'P', '4', '3') },
+    { CODEC_ID_MSMPEG4V3,    MKTAG('D', 'I', 'V', '3') },
     { CODEC_ID_MSMPEG4V3,    MKTAG('M', 'P', 'G', '3') },
     { CODEC_ID_MSMPEG4V3,    MKTAG('D', 'I', 'V', '5') },
     { CODEC_ID_MSMPEG4V3,    MKTAG('D', 'I', 'V', '6') },

diff --git a/tests/ref/vsynth1/msmpeg4 b/tests/ref/vsynth1/msmpeg4
index b4e903a..d94d3f0 100644 (file)
--- a/tests/ref/vsynth1/msmpeg4
+++ b/tests/ref/vsynth1/msmpeg4
@@ -1,4 +1,4 @@
-d437c6ab3775c50fdec00fa744bb5add *./tests/data/vsynth1/msmpeg4.avi
+4b08952b0afceb17ee3db31b67f6b778 *./tests/data/vsynth1/msmpeg4.avi
 624718 ./tests/data/vsynth1/msmpeg4.avi
 5ca72c39e3fc5df8e62f223c869589f5 *./tests/data/msmpeg4.vsynth1.out.yuv
 stddev:    7.98 PSNR: 30.09 MAXDIFF:  104 bytes:  7603200/  7603200

diff --git a/tests/ref/vsynth2/msmpeg4 b/tests/ref/vsynth2/msmpeg4
index 75ec82c..7620273 100644 (file)
--- a/tests/ref/vsynth2/msmpeg4
+++ b/tests/ref/vsynth2/msmpeg4
@@ -1,4 +1,4 @@
-3069f95f2ffca1f20c8ea36e2625fabc *./tests/data/vsynth2/msmpeg4.avi
+26dee25a62a66daba4f38ac6bd8f4677 *./tests/data/vsynth2/msmpeg4.avi
 127680 ./tests/data/vsynth2/msmpeg4.avi
 0e1c6e25c71c6a8fa8e506e3d97ca4c9 *./tests/data/msmpeg4.vsynth2.out.yuv
 stddev:    5.33 PSNR: 33.59 MAXDIFF:   78 bytes:  7603200/  7603200