# HG changeset patch
# User jbr
# Date 1199551660 0
# Node ID 98be2e14e5d67bbfe394eaf2a8968cef073bc19e
# Parent  f6b691720c7db9ac44de00b790e1230c0faf958a
do not set channels before checking request_channels

diff -r f6b691720c7d -r 98be2e14e5d6 liba52.c
--- a/liba52.c	Sat Jan 05 16:45:25 2008 +0000
+++ b/liba52.c	Sat Jan 05 16:47:40 2008 +0000
@@ -186,11 +186,12 @@
                     s->channels = ac3_channels[s->flags & 7];
                     if (s->flags & A52_LFE)
                         s->channels++;
-                        avctx->channels = s->channels;
                     if (avctx->request_channels > 0 &&
                             avctx->request_channels <= 2 &&
                             avctx->request_channels < s->channels) {
                         avctx->channels = avctx->request_channels;
+                    } else {
+                        avctx->channels = s->channels;
                     }
                     avctx->bit_rate = bit_rate;
                 }