1. ffmpeg
  2. Commit 91ab557b686920ee445dec2fb7f443f1acd3b87e
Browse code

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 <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Michael Niedermayer authored on 2011/12/31 12:14:27
Showing 1 changed files
libavcodec/aacdec.c
History View file @ 91ab557
... ... 
@@ -2093,7 +2093,7 @@ static int parse_adts_frame_header(AACContext *ac, GetBitContext *gb)
2093 2093
2094 2094 
     size = avpriv_aac_parse_header(gb, &hdr_info);
2095 2095 
     if (size > 0) {
2096 
-        if (hdr_info.chan_config && (hdr_info.chan_config!=ac->m4ac.chan_config || ac->m4ac.sample_rate!=hdr_info.sample_rate)) {
2096 
+        if (hdr_info.chan_config) {
2097 2097 
             enum ChannelPosition new_che_pos[4][MAX_ELEM_ID];
2098 2098 
             memset(new_che_pos, 0, 4 * MAX_ELEM_ID * sizeof(new_che_pos[0][0]));
2099 2099 
             ac->m4ac.chan_config = hdr_info.chan_config;