diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-31 04:14:27 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-31 06:06:05 +0100 |
| commit | 91ab557b686920ee445dec2fb7f443f1acd3b87e (patch) | |
| tree | 6f496ce1b1ec71459231b9a504ad6dbb04ccd231 | |
| parent | 4392b3d11e9f4b89a53f001ea8576e7da7801b08 (diff) | |
| download | ffmpeg-91ab557b686920ee445dec2fb7f443f1acd3b87e.tar.gz | |
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>
| -rw-r--r-- | libavcodec/aacdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |