[FFmpeg-cvslog] dsicinaudio: set channels and channel layout

[Justin Ruggles]

ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Wed Oct 17 11:29:04 2012 -0400| [4f56f9c48f40db7f84819fc923b79ddaac678ae7] | committer: Justin Ruggles

dsicinaudio: set channels and channel layout

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

 libavcodec/dsicinav.c |   12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/libavcodec/dsicinav.c b/libavcodec/dsicinav.c
index 1492717..2dcbf74 100644
--- a/libavcodec/dsicinav.c
+++ b/libavcodec/dsicinav.c
@@ -24,6 +24,7 @@
  * Delphine Software International CIN audio/video decoders
  */
 
+#include "libavutil/audioconvert.h"
 #include "avcodec.h"
 #include "bytestream.h"
 #include "mathops.h"
@@ -319,14 +320,11 @@ static av_cold int cinaudio_decode_init(AVCodecContext *avctx)
 {
     CinAudioContext *cin = avctx->priv_data;
 
-    if (avctx->channels != 1) {
-        av_log_ask_for_sample(avctx, "Number of channels is not supported\n");
-        return AVERROR_PATCHWELCOME;
-    }
-
     cin->initial_decode_frame = 1;
-    cin->delta = 0;
-    avctx->sample_fmt = AV_SAMPLE_FMT_S16;
+    cin->delta                = 0;
+    avctx->sample_fmt         = AV_SAMPLE_FMT_S16;
+    avctx->channels           = 1;
+    avctx->channel_layout     = AV_CH_LAYOUT_MONO;
 
     avcodec_get_frame_defaults(&cin->frame);
     avctx->coded_frame = &cin->frame;