From: Benjamin Larsson <banan@ludd.ltu.se>
Date: Sun, 16 Nov 2008 09:54:09 +0000 (+0000)
Subject: Set channel_layout
X-Git-Tag: v0.5~1954
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=31d5113a15ddbba386b3f78c068332ff601c290b;p=coroid%2Fffmpeg_saccubus.git

Set channel_layout

Originally committed as revision 15843 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavcodec/cook.c b/libavcodec/cook.c
index ba9f30fac..1affe03e7 100644
--- a/libavcodec/cook.c
+++ b/libavcodec/cook.c
@@ -1177,6 +1177,7 @@ static int cook_decode_init(AVCodecContext *avctx)
     }
 
     avctx->sample_fmt = SAMPLE_FMT_S16;
+    avctx->channel_layout = (avctx->channels==2) ? CH_LAYOUT_STEREO : CH_LAYOUT_MONO;
 
 #ifdef COOKDEBUG
     dump_cook_context(q);
diff --git a/libavcodec/imc.c b/libavcodec/imc.c
index 436a5c955..e896eed1b 100644
--- a/libavcodec/imc.c
+++ b/libavcodec/imc.c
@@ -155,6 +155,7 @@ static av_cold int imc_decode_init(AVCodecContext * avctx)
     ff_fft_init(&q->fft, 7, 1);
     dsputil_init(&q->dsp, avctx);
     avctx->sample_fmt = SAMPLE_FMT_S16;
+    avctx->channel_layout = (avctx->channels==2) ? CH_LAYOUT_STEREO : CH_LAYOUT_MONO;
     return 0;
 }
 
diff --git a/libavcodec/nellymoserdec.c b/libavcodec/nellymoserdec.c
index f2a413e49..dfbb41caf 100644
--- a/libavcodec/nellymoserdec.c
+++ b/libavcodec/nellymoserdec.c
@@ -148,6 +148,7 @@ static av_cold int decode_init(AVCodecContext * avctx) {
         ff_sine_window_init(sine_window, 128);
 
     avctx->sample_fmt = SAMPLE_FMT_S16;
+    avctx->channel_layout = CH_LAYOUT_MONO;
     return 0;
 }