summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2012-10-17 11:29:04 -0400
committerJustin Ruggles <justin.ruggles@gmail.com>2012-11-01 11:29:14 -0400
commit4f56f9c48f40db7f84819fc923b79ddaac678ae7 (patch)
tree66afb10fe063de6b559c4c226c3a3c6e939178b4 /libavcodec
parentec2694d25905c217e5815947cda896aa25398388 (diff)
dsicinaudio: set channels and channel layout
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/dsicinav.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/libavcodec/dsicinav.c b/libavcodec/dsicinav.c
index 1492717f66..2dcbf745ea 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;