diff options
| author | Gert Vervoort <Gert.Vervoort@wxs.nl> | 2002-04-29 18:32:03 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2002-04-29 18:32:03 +0000 |
| commit | bb3debab2cfa9e3e44273ea440cf39e5a872da6d (patch) | |
| tree | 00276258527ec67d32b5007577e238899bfb4117 /libav | |
| parent | f94985d046c5e0775e6bf259ec307398554341c6 (diff) | |
more msmpeg4 fourccs patch by Gert Vervoort <Gert.Vervoort@wxs.nl>
Originally committed as revision 426 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libav')
| -rw-r--r-- | libav/asf.c | 6 | ||||
| -rw-r--r-- | libav/avienc.c | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/libav/asf.c b/libav/asf.c index adc2437ea4..23a2cb3471 100644 --- 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_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 }, }; diff --git a/libav/avienc.c b/libav/avienc.c index e1944e8c11..52fdea237e 100644 --- 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_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 }, }; |