diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-23 02:43:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-23 02:43:57 +0200 |
| commit | 981503905399a25ba179f587efda4a18ac9f4675 (patch) | |
| tree | be505efda0004dd2794ee5862560b315b3668845 /libavcodec/aacdec.c | |
| parent | b87d4c2b9f4106045afeabe1f1338c3eddb66935 (diff) | |
| download | ffmpeg-981503905399a25ba179f587efda4a18ac9f4675.tar.gz | |
aacdec: disable locking code for parse_adts_frame_header() non zero chan config.
This fixes changing channels
It possibly might cause regressions but i cant avoid this without having a test
case that needs the locking code.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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 161e9c6e3f..557e5268f2 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -2079,7 +2079,7 @@ static int parse_adts_frame_header(AACContext *ac, GetBitContext *gb) size = ff_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; |