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/matroska.c | |
parent | 6c4d16556b96dae18977fddad3a43faaed579993 (diff) | |
download | ffmpeg-streaming-cbee7a69448467ca615a53fd3927b53b1547509d.zip ffmpeg-streaming-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/matroska.c')
-rw-r--r-- | libavformat/matroska.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavformat/matroska.c b/libavformat/matroska.c index b798275..9de257c 100644 --- a/libavformat/matroska.c +++ b/libavformat/matroska.c @@ -222,8 +222,7 @@ static CodecTags codec_tags[]={ {"A_AC3" , CODEC_ID_AC3}, {"A_DTS" , CODEC_ID_DTS}, {"A_VORBIS" , CODEC_ID_VORBIS}, - {"A_AAC/MPEG2/" , CODEC_ID_AAC}, - {"A_AAC/MPEG4/" , CODEC_ID_MPEG4AAC}, + {"A_AAC/" , CODEC_ID_AAC}, {"A_WAVPACK4" , CODEC_ID_WAVPACK}, {NULL , CODEC_ID_NONE} /* TODO: AC3-9/10 (?), Real, Musepack, Quicktime */ @@ -2246,7 +2245,7 @@ matroska_read_header (AVFormatContext *s, } - if (codec_id==CODEC_ID_AAC || codec_id==CODEC_ID_MPEG4AAC) { + if (codec_id==CODEC_ID_AAC) { MatroskaAudioTrack *audiotrack = (MatroskaAudioTrack *) track; int profile = matroska_aac_profile(track->codec_id); int sri = matroska_aac_sri(audiotrack->internal_samplerate); |