]> rtime.felk.cvut.cz Git - frescor/ffmpeg.git/commitdiff
Set channel_layout
authorbanan <banan@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Sun, 16 Nov 2008 09:54:09 +0000 (09:54 +0000)
committerbanan <banan@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Sun, 16 Nov 2008 09:54:09 +0000 (09:54 +0000)
git-svn-id: file:///var/local/repositories/ffmpeg/trunk@15843 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

libavcodec/cook.c
libavcodec/imc.c
libavcodec/nellymoserdec.c

index ba9f30facd8e3b4e6f7eebc2b8bf41d33a4111ea..1affe03e7ce36504b92f420daa7af63eac4c4668 100644 (file)
@@ -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);
index 436a5c95528055b8716a2b8add44a91973acab30..e896eed1b98d9a45512a10332c3aee32ab961f9d 100644 (file)
@@ -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;
 }
 
index f2a413e49a4daef14d0bb61e9631a743879c09ed..dfbb41caf4fcb0387ee472e08263adc31bb5e45e 100644 (file)
@@ -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;
 }