diff options
| author | Alex Converse <alex.converse@gmail.com> | 2011-11-22 12:12:10 -0800 |
|---|---|---|
| committer | Alex Converse <alex.converse@gmail.com> | 2011-11-22 14:33:11 -0800 |
| commit | 963f6855356fa527a27b08b55e026f683a12cebc (patch) | |
| tree | d94594dc3371e0489cc5968d9bd3ec2d41670e2e /libavcodec | |
| parent | 105ab61c5f68d58731ccc592176aa9fc073b32b1 (diff) | |
| download | ffmpeg-963f6855356fa527a27b08b55e026f683a12cebc.tar.gz | |
aacdec: Fix PS in ADTS.
Fixes File1.aac and Bug 80.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/aacdec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index 203ecd3423..1015030b9a 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -2085,7 +2085,8 @@ static int parse_adts_frame_header(AACContext *ac, GetBitContext *gb) ac->m4ac.chan_config = hdr_info.chan_config; if (set_default_channel_config(ac->avctx, new_che_pos, hdr_info.chan_config)) return -7; - if (output_configure(ac, ac->che_pos, new_che_pos, hdr_info.chan_config, OC_TRIAL_FRAME)) + if (output_configure(ac, ac->che_pos, new_che_pos, hdr_info.chan_config, + FFMAX(ac->output_configured, OC_TRIAL_FRAME))) return -7; } else if (ac->output_configured != OC_LOCKED) { ac->m4ac.chan_config = 0; |