From 91ab557b686920ee445dec2fb7f443f1acd3b87e Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 31 Dec 2011 04:14:27 +0100 Subject: [PATCH] Revert "aacdec: Avoid unneeded reinit due to ADTS headers" This has been fixed differently and its revert avoids error messages when decoding xx.flv. This also reduces the difference to qatar. This reverts commit 5a2b3f3a52070232a68582a502fb60a9226ca86a. Reviewed-by: Derek Buitenhuis Signed-off-by: Michael Niedermayer --- libavcodec/aacdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index 8fd7f08c78..030feb1371 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -2093,7 +2093,7 @@ static int parse_adts_frame_header(AACContext *ac, GetBitContext *gb) size = avpriv_aac_parse_header(gb, &hdr_info); if (size > 0) { - if (hdr_info.chan_config && (hdr_info.chan_config!=ac->m4ac.chan_config || ac->m4ac.sample_rate!=hdr_info.sample_rate)) { + if (hdr_info.chan_config) { enum ChannelPosition new_che_pos[4][MAX_ELEM_ID]; memset(new_che_pos, 0, 4 * MAX_ELEM_ID * sizeof(new_che_pos[0][0])); ac->m4ac.chan_config = hdr_info.chan_config;