mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
more msmpeg4 fourccs patch by Gert Vervoort <Gert.Vervoort@wxs.nl>
Originally committed as revision 426 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
f94985d046
commit
bb3debab2c
@ -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('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_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 },
|
{ 0, 0 },
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -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('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_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 },
|
{ 0, 0 },
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user