diff options
| author | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2010-07-20 09:44:21 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2010-07-20 09:44:21 +0000 |
| commit | 2d91366cc21cc2d0496d3d3255c151d843b2da7f (patch) | |
| tree | eb76d5fe4dfce88a625fa3d902e8b33df35590ec | |
| parent | 8b6e0aec9fb07b0d1286e3ff5d858e22d09dc83c (diff) | |
| download | ffmpeg-2d91366cc21cc2d0496d3d3255c151d843b2da7f.tar.gz | |
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
| -rw-r--r-- | libavformat/riff.c | 2 | ||||
| -rw-r--r-- | tests/ref/vsynth1/msmpeg4 | 2 | ||||
| -rw-r--r-- | tests/ref/vsynth2/msmpeg4 | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c index 17b47f0a65..137ea7c313 100644 --- 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 b4e903ac1d..d94d3f095f 100644 --- 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 75ec82cd40..762027379b 100644 --- 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 |