diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-21 09:41:35 +0000 |
|---|---|---|
| committer | Janne Grunau <janne-libav@jannau.net> | 2011-10-28 22:44:59 +0200 |
| commit | bc2dd36740ef13d1f95c243ff58167fafb3d9a51 (patch) | |
| tree | e1ee8ed7df47b8b5c053dd484c96f2792aaa0cf0 /libavcodec/aacdec.c | |
| parent | f3db0f7403f652428930dd77d5fd049b8165c54a (diff) | |
| download | ffmpeg-bc2dd36740ef13d1f95c243ff58167fafb3d9a51.tar.gz | |
aacdec: allow output reconfiguration on channel changes
Locking the decoder against channel config changes in
parse_adts_frame_header() seems to be unnecessary and
streams with channel config changes are reported.
The sample in http://roundup.libav.org/issue999 still works.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Diffstat (limited to 'libavcodec/aacdec.c')
| -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 ca69e77e29..203ecd3423 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -2079,7 +2079,7 @@ static int parse_adts_frame_header(AACContext *ac, GetBitContext *gb) size = avpriv_aac_parse_header(gb, &hdr_info); if (size > 0) { - if (ac->output_configured != OC_LOCKED && hdr_info.chan_config) { + 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; |