[libav-devel] [PATCH] ac3dec: use request_channel_layout instead of request_channels

[Vittorio Giovara]

---
Maybe this could be squashed in previous patch.
Vittorio

 libavcodec/ac3dec.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c
index fd0bf33..670e098 100644
--- a/libavcodec/ac3dec.c
+++ b/libavcodec/ac3dec.c
@@ -178,10 +178,10 @@ static av_cold int ac3_decode_init(AVCodecContext *avctx)
     avctx->sample_fmt = AV_SAMPLE_FMT_FLTP;
 
     /* allow downmixing to stereo or mono */
-    if (avctx->channels > 0 && avctx->request_channels > 0 &&
-            avctx->request_channels < avctx->channels &&
-            avctx->request_channels <= 2) {
-        avctx->channels = avctx->request_channels;
+    if (avctx->channels > 0 && avctx->request_channel_layout > 0 &&
+        avctx->request_channel_layout < avctx->channels &&
+        avctx->request_channel_layout <= 2) {
+        avctx->channels = avctx->request_channel_layout;
     }
     s->downmixed = 1;
 
@@ -1347,10 +1347,11 @@ static int ac3_decode_frame(AVCodecContext * avctx, 
void *data,
         s->output_mode  = s->channel_mode;
         if (s->lfe_on)
             s->output_mode |= AC3_OUTPUT_LFEON;
-        if (avctx->request_channels > 0 && avctx->request_channels <= 2 &&
-                avctx->request_channels < s->channels) {
-            s->out_channels = avctx->request_channels;
-            s->output_mode  = avctx->request_channels == 1 ? AC3_CHMODE_MONO : 
AC3_CHMODE_STEREO;
+        if (avctx->request_channel_layout > 0 &&
+            avctx->request_channel_layout <= 2 &&
+            avctx->request_channel_layout < s->channels) {
+            s->out_channels = avctx->request_channel_layout;
+            s->output_mode  = avctx->request_channel_layout == 1 ? 
AC3_CHMODE_MONO : AC3_CHMODE_STEREO;
             s->channel_layout = avpriv_ac3_channel_layout_tab[s->output_mode];
         }
         avctx->channels       = s->out_channels;
-- 
1.8.4

_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel