From: Michael Niedermayer <[email protected]> On Mon, Oct 24, 2011 at 06:19:42PM -0700, Alex Converse wrote: > > Sorry that my tone seemed hostile earlier. wrongsync.aac plays ok so I > guess this patch seems OK. Anyone else have opinions on this?
seems fine, If you suspect that it could cause trouble it might sense to check if config has changed. commit message reformulated Janne ---8<--- 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 <[email protected]> --- libavcodec/aacdec.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index ca69e77..203ecd3 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; -- 1.7.7.1 _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
