From fbdcdaee6e458103bbb2e489b62fa5670ffa4b24 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 (cherry picked from commit c2fcd0a7a4d0bda1a3306e40b70ce281a987df60) --- libavcodec/cook.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libavcodec/cook.c') diff --git a/libavcodec/cook.c b/libavcodec/cook.c index 6b70560546..9d3d001297 100644 --- a/libavcodec/cook.c +++ b/libavcodec/cook.c @@ -53,6 +53,7 @@ #include "dsputil.h" #include "bytestream.h" #include "fft.h" +#include "libavcore/audioconvert.h" #include "cookdata.h" @@ -1274,7 +1275,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx) if (channel_mask) avctx->channel_layout = channel_mask; else - 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; #ifdef COOKDEBUG dump_cook_context(q); -- cgit v1.2.3