Mercurial > libavcodec.hg

changeset 6111:ed3937d4f2aa libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
do not set channels before checking request_channels
author jbr
date Sat, 05 Jan 2008 15:18:15 +0000
parents 356a3c897bd2
children 1e77145f9c74
files aac_ac3_parser.c
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/aac_ac3_parser.c	Sat Jan 05 05:36:00 2008 +0000
+++ b/aac_ac3_parser.c	Sat Jan 05 15:18:15 2008 +0000
@@ -60,13 +60,14 @@
                     s->frame_size = len;
                     /* update codec info */
                     avctx->sample_rate = sample_rate;
-                    avctx->channels = channels;
                     /* allow downmixing to mono or stereo for AC3 */
                     if(avctx->request_channels > 0 &&
                             avctx->request_channels < channels &&
                             avctx->request_channels <= 2 &&
                             avctx->codec_id == CODEC_ID_AC3) {
                         avctx->channels = avctx->request_channels;
+                    } else {
+                        avctx->channels = channels;
                     }
                     avctx->bit_rate = bit_rate;
                     avctx->frame_size = samples;