From c2fcd0a7a4d0bda1a3306e40b70ce281a987df60 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Thu, 3 Feb 2011 14:26:09 +0100 Subject: Replace remaining occurrences of deprecated CH_* with AV_CH_* Signed-off-by: Ronald S. Bultje --- libavcodec/mpc7.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libavcodec/mpc7.c') diff --git a/libavcodec/mpc7.c b/libavcodec/mpc7.c index a77648f770..8bdb9e5813 100644 --- a/libavcodec/mpc7.c +++ b/libavcodec/mpc7.c @@ -30,6 +30,7 @@ #include "get_bits.h" #include "dsputil.h" #include "mpegaudio.h" +#include "libavcore/audioconvert.h" #include "mpc.h" #include "mpc7data.h" @@ -86,7 +87,7 @@ static av_cold int mpc7_decode_init(AVCodecContext * avctx) c->frames_to_skip = 0; avctx->sample_fmt = AV_SAMPLE_FMT_S16; - avctx->channel_layout = (avctx->channels==2) ? CH_LAYOUT_STEREO : CH_LAYOUT_MONO; + avctx->channel_layout = (avctx->channels==2) ? AV_CH_LAYOUT_STEREO : AV_CH_LAYOUT_MONO; if(vlc_initialized) return 0; av_log(avctx, AV_LOG_DEBUG, "Initing VLC\n"); -- cgit v1.2.3