From cbee7a69448467ca615a53fd3927b53b1547509d Mon Sep 17 00:00:00 2001 From: Baptiste Coudurier Date: Thu, 9 Nov 2006 11:37:30 +0000 Subject: get rid of CODEC_ID_MPEG4AAC after next version bump, and change it to CODEC_ID_AAC where used Originally committed as revision 6954 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/riff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavformat/riff.c') diff --git a/libavformat/riff.c b/libavformat/riff.c index ec9abda..fb2a7fc 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -186,7 +186,7 @@ const CodecTag codec_wav_tags[] = { { CODEC_ID_WMAV1, 0x160 }, { CODEC_ID_WMAV2, 0x161 }, { CODEC_ID_AAC, 0x706d }, - { CODEC_ID_MPEG4AAC, 0xff }, + { CODEC_ID_AAC, 0xff }, { CODEC_ID_VORBIS, ('V'<<8)+'o' }, //HACK/FIXME, does vorbis in WAV/AVI have an (in)official id? { CODEC_ID_SONIC, 0x2048 }, { CODEC_ID_SONIC_LS, 0x2048 }, -- cgit v1.1