Module: libav Branch: master Commit: 43886eaebc8e803a2f90051afd03068be47e398f
Author: Alex Converse <[email protected]> Committer: Alex Converse <[email protected]> Date: Tue Jun 19 19:06:34 2012 -0700 aacdec: Fix popping channel layouts. 'channel_layout' not 'channels' from the stored configuration should go to AVCodecContext's 'channel_layout'. --- libavcodec/aacdec.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index 3cf4a7f..f16b831 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -368,7 +368,7 @@ static void pop_output_configuration(AACContext *ac) { if (ac->oc[1].status != OC_LOCKED) { ac->oc[1] = ac->oc[0]; ac->avctx->channels = ac->oc[1].channels; - ac->avctx->channel_layout = ac->oc[1].channels; + ac->avctx->channel_layout = ac->oc[1].channel_layout; } } _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
