Mercurial > libavformat.hg
changeset 4071:a1f5c4042d4f libavformat
add mpeg2 fourcc and aac format tag from asf
author | compn |
---|---|
date | Mon, 08 Dec 2008 20:09:15 +0000 |
parents | 7f9fb963926c |
children | b9bb53432c60 |
files | riff.c |
diffstat | 1 files changed, 2 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/riff.c Sun Dec 07 17:29:09 2008 +0000 +++ b/riff.c Mon Dec 08 20:09:15 2008 +0000 @@ -100,6 +100,7 @@ { CODEC_ID_MPEG2VIDEO, MKTAG( 2 , 0 , 0 , 16) }, { CODEC_ID_MPEG2VIDEO, MKTAG('D', 'V', 'R', ' ') }, { CODEC_ID_MPEG2VIDEO, MKTAG('M', 'M', 'E', 'S') }, + { CODEC_ID_MPEG2VIDEO, MKTAG('L', 'M', 'P', '2') }, /* Lead MPEG2 in avi */ { CODEC_ID_MJPEG, MKTAG('M', 'J', 'P', 'G') }, { CODEC_ID_MJPEG, MKTAG('L', 'J', 'P', 'G') }, { CODEC_ID_MJPEG, MKTAG('d', 'm', 'b', '1') }, @@ -220,6 +221,7 @@ { CODEC_ID_SONIC, 0x2048 }, { CODEC_ID_SONIC_LS, 0x2048 }, { CODEC_ID_AAC, 0x706d }, + { CODEC_ID_AAC, 0x4143 }, { CODEC_ID_FLAC, 0xF1AC }, { CODEC_ID_ADPCM_SWF, ('S'<<8)+'F' }, { CODEC_ID_VORBIS, ('V'<<8)+'o' }, //HACK/FIXME, does vorbis in WAV/AVI have an (in)official id?