aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Converse <alex.converse@gmail.com>2011-09-30 20:08:10 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-09-30 20:08:10 +0200
commit3b0e242825104941a190bf9fc995a329b52bd109 (patch)
treec5e5ad3b116fe35d41462f010b0436e1fbc7520a
parent53d5c463b2237f1d1a3a218348dc3bc6f0f33376 (diff)
downloadffmpeg-3b0e242825104941a190bf9fc995a329b52bd109.tar.gz
lavf/utils: Drop old hack for implicit HE-AAC signaling.
It has not been needed since a58858d60d37c7abfcea11bb387909bf9cd4916d. Fixes decode of implicit HE-AAC without extradata or ADTS headers.
-rw-r--r--libavformat/utils.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c
index bb926d5d20..0d88991661 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -2299,15 +2299,6 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options)
for(i=0;i<ic->nb_streams;i++) {
AVCodec *codec;
st = ic->streams[i];
- if (st->codec->codec_id == CODEC_ID_AAC && st->codec->extradata_size) {
- // We need to discard these since they can be plain wrong for
- // backwards compatible HE-AAC signaling.
- // But when we have no extradata we need to keep them or we can't
- // play anything at all.
- st->codec->sample_rate = 0;
- st->codec->frame_size = 0;
- st->codec->channels = 0;
- }
if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO ||
st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE) {