[FFmpeg-cvslog] mp3adu: Set the channel layout properly

Martin Storsjö git at videolan.org
Thu Dec 12 13:10:54 CET 2013


ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Wed Dec 11 18:52:44 2013 +0200| [35686a289fcd2f9d7502e45002f168a753b11f9c] | committer: Martin Storsjö

mp3adu: Set the channel layout properly

This fixes decoding, broken since 7e35037.

This is similar to what was done for the normal mp3 decoder in
f4a86bc9.

Signed-off-by: Martin Storsjö <martin at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=35686a289fcd2f9d7502e45002f168a753b11f9c
---

 libavcodec/mpegaudiodec_template.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/libavcodec/mpegaudiodec_template.c b/libavcodec/mpegaudiodec_template.c
index 9427dbf..9ce03ef 100644
--- a/libavcodec/mpegaudiodec_template.c
+++ b/libavcodec/mpegaudiodec_template.c
@@ -1722,6 +1722,7 @@ static int decode_frame_adu(AVCodecContext *avctx, void *data,
     /* update codec info */
     avctx->sample_rate = s->sample_rate;
     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;
 



More information about the ffmpeg-cvslog mailing list