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/wavpack.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libavcodec/wavpack.c') diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c index e96981460b..ffb5018c57 100644 --- a/libavcodec/wavpack.c +++ b/libavcodec/wavpack.c @@ -22,6 +22,7 @@ #include "avcodec.h" #include "get_bits.h" #include "unary.h" +#include "libavcore/audioconvert.h" /** * @file @@ -706,7 +707,7 @@ static av_cold int wavpack_decode_init(AVCodecContext *avctx) else avctx->sample_fmt = AV_SAMPLE_FMT_S32; if(avctx->channels <= 2 && !avctx->channel_layout) - 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; s->multichannel = avctx->channels > 2; /* lavf demuxer does not provide extradata, Matroska stores 0x403 -- cgit v1.2.3