From 9e6ec2d7d57e1995d612b0407212de1faa5e0413 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Tue, 7 May 2013 07:20:32 +0200 Subject: apedec: convert to new channel layout API Signed-off-by: Vittorio Giovara Signed-off-by: Anton Khirnov Signed-off-by: James Almer --- libavcodec/apedec.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c index 923f79046b..ab788c0669 100644 --- a/libavcodec/apedec.c +++ b/libavcodec/apedec.c @@ -233,13 +233,14 @@ static av_cold int ape_decode_close(AVCodecContext *avctx) static av_cold int ape_decode_init(AVCodecContext *avctx) { APEContext *s = avctx->priv_data; + int channels = avctx->ch_layout.nb_channels; int i; if (avctx->extradata_size != 6) { av_log(avctx, AV_LOG_ERROR, "Incorrect extradata\n"); return AVERROR(EINVAL); } - if (avctx->channels > 2) { + if (channels > 2) { av_log(avctx, AV_LOG_ERROR, "Only mono and stereo is supported\n"); return AVERROR(EINVAL); } @@ -261,7 +262,7 @@ static av_cold int ape_decode_init(AVCodecContext *avctx) return AVERROR_PATCHWELCOME; } s->avctx = avctx; - s->channels = avctx->channels; + s->channels = channels; s->fileversion = AV_RL16(avctx->extradata); s->compression_level = AV_RL16(avctx->extradata + 2); s->flags = AV_RL16(avctx->extradata + 4); @@ -313,7 +314,9 @@ static av_cold int ape_decode_init(AVCodecContext *avctx) ff_bswapdsp_init(&s->bdsp); ff_llauddsp_init(&s->adsp); - avctx->channel_layout = (avctx->channels==2) ? AV_CH_LAYOUT_STEREO : AV_CH_LAYOUT_MONO; + av_channel_layout_uninit(&avctx->ch_layout); + avctx->ch_layout = (channels == 2) ? (AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO + : (AVChannelLayout)AV_CHANNEL_LAYOUT_MONO; return 0; } -- cgit v1.2.3