summaryrefslogtreecommitdiff
path: root/libavcodec/imc.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-02-03 14:26:09 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-02-06 20:31:47 +0100
commitfbdcdaee6e458103bbb2e489b62fa5670ffa4b24 (patch)
treee6851bd6403c454bfaa27e331d7e01cd2817bd81 /libavcodec/imc.c
parent6e59474b3093ea0b3193e88bae81ed764683809a (diff)
Replace remaining occurrences of deprecated CH_* with AV_CH_*
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit c2fcd0a7a4d0bda1a3306e40b70ce281a987df60)
Diffstat (limited to 'libavcodec/imc.c')
-rw-r--r--libavcodec/imc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/imc.c b/libavcodec/imc.c
index 4d7fbd1db6..2b9de0b021 100644
--- a/libavcodec/imc.c
+++ b/libavcodec/imc.c
@@ -40,6 +40,7 @@
#include "get_bits.h"
#include "dsputil.h"
#include "fft.h"
+#include "libavcore/audioconvert.h"
#include "imcdata.h"
@@ -157,7 +158,7 @@ static av_cold int imc_decode_init(AVCodecContext * avctx)
ff_fft_init(&q->fft, 7, 1);
dsputil_init(&q->dsp, avctx);
avctx->sample_fmt = AV_SAMPLE_FMT_FLT;
- 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;
return 0;
}