aacdec: Avoid unneeded reinit due to ADTS headers

Fixes Ticket 662 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago · 5a2b3f3a52
parent 1dbd433f0d
commit 5a2b3f3a52
1 changed files with 1 additions and 1 deletions
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@ -2081,7 +2081,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) {
+        if (hdr_info.chan_config && (hdr_info.chan_config!=ac->m4ac.chan_config || ac->m4ac.sample_rate!=hdr_info.sample_rate)) {
            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;