diff options
| author | Ben Littler <tempn@twmi.rr.com> | 2008-12-08 20:09:15 +0000 |
|---|---|---|
| committer | Ben Littler <tempn@twmi.rr.com> | 2008-12-08 20:09:15 +0000 |
| commit | 6cffaea8dbf9c1fbebdcb3df804b84a911d3fb32 (patch) | |
| tree | deffeaced5a260f0accd0d29638c04c12afa7cc4 /libavformat/riff.c | |
| parent | 20e047262fe66e0e045335eb23997e63d802141f (diff) | |
| download | ffmpeg-6cffaea8dbf9c1fbebdcb3df804b84a911d3fb32.tar.gz | |
add mpeg2 fourcc and aac format tag from asf
Originally committed as revision 16036 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/riff.c')
| -rw-r--r-- | libavformat/riff.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c index 97d75513ac..cb3354f3a1 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -100,6 +100,7 @@ const AVCodecTag codec_bmp_tags[] = { { 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 @@ const AVCodecTag codec_wav_tags[] = { { 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? |