diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2006-11-09 11:37:30 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2006-11-09 11:37:30 +0000 |
| commit | cbee7a69448467ca615a53fd3927b53b1547509d (patch) | |
| tree | fb82a9365866806832a994ff7932c8d9e06c8d2f /libavformat/riff.c | |
| parent | 6c4d16556b96dae18977fddad3a43faaed579993 (diff) | |
| download | ffmpeg-cbee7a69448467ca615a53fd3927b53b1547509d.tar.gz | |
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
Diffstat (limited to 'libavformat/riff.c')
| -rw-r--r-- | libavformat/riff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c index ec9abda3c9..fb2a7fc9af 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 }, |