cng: convert to new channel layout API

Anton Khirnov committed 13 years ago

Commit cdde7fe1 parent 1d2f7e02 files · +3 −6Browse files

Unified · Split

2 files

@@ -56,7 +56,8 @@ static av_cold int cng_decode_init(AVCodecContext *avctx) · 55 unmodified lines
56	CNGContext *p = avctx->priv_data;	56	CNGContext *p = avctx->priv_data;
57		57
58	avctx->sample_fmt = AV_SAMPLE_FMT_S16;	58	avctx->sample_fmt = AV_SAMPLE_FMT_S16;
59	avctx->channels = 1;	59	av_channel_layout_uninit(&avctx->ch_layout);
		60	avctx->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_MONO;
60	avctx->sample_rate = 8000;	61	avctx->sample_rate = 8000;
61		62
62	p->order = 12;	63	p->order = 12;

     CNGContext *p = avctx->priv_data;
     int ret;
-    if (avctx->channels != 1) {
-        av_log(avctx, AV_LOG_ERROR, "Only mono supported\n");
-        return AVERROR(EINVAL);
-    }
     avctx->frame_size = 640;
     p->order = 10;
     if ((ret = ff_lpc_init(&p->lpc, avctx->frame_size, p->order, FF_LPC_TYPE_LEVINSON)) < 0)
     .close          = cng_encode_close,
     .sample_fmts    = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
                                                      AV_SAMPLE_FMT_NONE },
+    .ch_layouts     = (const AVChannelLayout[]){ AV_CHANNEL_LAYOUT_MONO, { 0 } },
     .caps_internal  = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP,
 };

Keyboard shortcuts