From: Justin Ruggles <justin.ruggles@gmail.com>
Date: Mon, 1 Oct 2012 02:14:10 +0000 (-0400)
Subject: libspeexdec: set channel_layout
X-Git-Tag: v9_beta1~157
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=27c3f9c03e1d0290dfd6e185b75acdf463bdb7b2;p=platform%2Fupstream%2Flibav.git

libspeexdec: set channel_layout
---

diff --git a/libavcodec/libspeexdec.c b/libavcodec/libspeexdec.c
index b9d9149..21c9d05 100644
--- a/libavcodec/libspeexdec.c
+++ b/libavcodec/libspeexdec.c
@@ -22,8 +22,10 @@
 #include <speex/speex_header.h>
 #include <speex/speex_stereo.h>
 #include <speex/speex_callbacks.h>
-#include "avcodec.h"
+
+#include "libavutil/audioconvert.h"
 #include "libavutil/common.h"
+#include "avcodec.h"
 
 typedef struct {
     AVFrame frame;
@@ -76,6 +78,8 @@ static av_cold int libspeex_decode_init(AVCodecContext *avctx)
                                     "Decoding as stereo.\n", avctx->channels);
         avctx->channels = 2;
     }
+    avctx->channel_layout = avctx->channels == 2 ? AV_CH_LAYOUT_STEREO :
+                                                   AV_CH_LAYOUT_MONO;
 
     speex_bits_init(&s->bits);
     s->dec_state = speex_decoder_init(mode);