[SCM] libav/experimental: Set channel_layout for mpegaudio

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit f4a86bc981d6743778dd1037fea243d36229ede1
Author: Kieran Kunhya <kieran at kunhya.com>
Date:   Sat Feb 5 17:59:48 2011 +0000

    Set channel_layout for mpegaudio
    
    Signed-off-by: Ronald S. Bultje <rsbultje at gmail.com>

diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c
index 7b296c4..aa31e46 100644
--- a/libavcodec/mpegaudiodec.c
+++ b/libavcodec/mpegaudiodec.c
@@ -2054,6 +2054,7 @@ static int decode_frame(AVCodecContext * avctx,
     }
     /* update codec info */
     avctx->channels = s->nb_channels;
+    avctx->channel_layout = s->nb_channels == 1 ? AV_CH_LAYOUT_MONO : AV_CH_LAYOUT_STEREO;
     if (!avctx->bit_rate)
         avctx->bit_rate = s->bit_rate;
     avctx->sub_id = s->layer;

-- 
Libav/FFmpeg packaging