diff options
| author | Alex Converse <alex.converse@gmail.com> | 2012-06-19 19:06:34 -0700 |
|---|---|---|
| committer | Alex Converse <alex.converse@gmail.com> | 2012-06-20 09:35:58 -0700 |
| commit | 43886eaebc8e803a2f90051afd03068be47e398f (patch) | |
| tree | b5f09b8e512d4e6b941aa32196132dfe1e8af695 /libavcodec/aacdec.c | |
| parent | 61183b5ab4c203363ee0ee696bdf4819be307230 (diff) | |
| download | ffmpeg-43886eaebc8e803a2f90051afd03068be47e398f.tar.gz | |
aacdec: Fix popping channel layouts.
'channel_layout' not 'channels' from the stored configuration should go
to AVCodecContext's 'channel_layout'.
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 3cf4a7fe18..f16b831ccd 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; } } |