[FFmpeg-cvslog] r15884 - in trunk/libavcodec: apedec.c mpc7.c mpc8.c smacker.c wavpack.c

[kostya]

Author: kostya
Date: Wed Nov 19 15:57:48 2008
New Revision: 15884

Log:
Add channel layout to several audio decoders I maintain

Modified:
   trunk/libavcodec/apedec.c
   trunk/libavcodec/mpc7.c
   trunk/libavcodec/mpc8.c
   trunk/libavcodec/smacker.c
   trunk/libavcodec/wavpack.c

Modified: trunk/libavcodec/apedec.c
==============================================================================
--- trunk/libavcodec/apedec.c	(original)
+++ trunk/libavcodec/apedec.c	Wed Nov 19 15:57:48 2008
@@ -199,6 +199,7 @@ static av_cold int ape_decode_init(AVCod
 
     dsputil_init(&s->dsp, avctx);
     avctx->sample_fmt = SAMPLE_FMT_S16;
+    avctx->channel_layout = (avctx->channels==2) ? CH_LAYOUT_STEREO : CH_LAYOUT_MONO;
     return 0;
 }
 

Modified: trunk/libavcodec/mpc7.c
==============================================================================
--- trunk/libavcodec/mpc7.c	(original)
+++ trunk/libavcodec/mpc7.c	Wed Nov 19 15:57:48 2008
@@ -109,6 +109,7 @@ static av_cold int mpc7_decode_init(AVCo
     }
     vlc_initialized = 1;
     avctx->sample_fmt = SAMPLE_FMT_S16;
+    avctx->channel_layout = (avctx->channels==2) ? CH_LAYOUT_STEREO : CH_LAYOUT_MONO;
     return 0;
 }
 

Modified: trunk/libavcodec/mpc8.c
==============================================================================
--- trunk/libavcodec/mpc8.c	(original)
+++ trunk/libavcodec/mpc8.c	Wed Nov 19 15:57:48 2008
@@ -178,6 +178,7 @@ static av_cold int mpc8_decode_init(AVCo
     }
     vlc_initialized = 1;
     avctx->sample_fmt = SAMPLE_FMT_S16;
+    avctx->channel_layout = (avctx->channels==2) ? CH_LAYOUT_STEREO : CH_LAYOUT_MONO;
     return 0;
 }
 

Modified: trunk/libavcodec/smacker.c
==============================================================================
--- trunk/libavcodec/smacker.c	(original)
+++ trunk/libavcodec/smacker.c	Wed Nov 19 15:57:48 2008
@@ -559,6 +559,7 @@ static av_cold int decode_end(AVCodecCon
 static av_cold int smka_decode_init(AVCodecContext *avctx)
 {
     avctx->sample_fmt = SAMPLE_FMT_S16;
+    avctx->channel_layout = (avctx->channels==2) ? CH_LAYOUT_STEREO : CH_LAYOUT_MONO;
     return 0;
 }
 

Modified: trunk/libavcodec/wavpack.c
==============================================================================
--- trunk/libavcodec/wavpack.c	(original)
+++ trunk/libavcodec/wavpack.c	Wed Nov 19 15:57:48 2008
@@ -361,6 +361,7 @@ static av_cold int wavpack_decode_init(A
     s->avctx = avctx;
     s->stereo = (avctx->channels == 2);
     avctx->sample_fmt = SAMPLE_FMT_S16;
+    avctx->channel_layout = (avctx->channels==2) ? CH_LAYOUT_STEREO : CH_LAYOUT_MONO;
 
     return 0;
 }