summaryrefslogtreecommitdiff
path: root/libavcodec/mpc8.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-02-03 14:26:09 +0100
committerRonald S. Bultje <rsbultje@gmail.com>2011-02-06 08:26:12 -0500
commitc2fcd0a7a4d0bda1a3306e40b70ce281a987df60 (patch)
tree2f1d6751e938b53e2ae2734393079ef296666bbd /libavcodec/mpc8.c
parentad3cffb68f9c77e140660a8ae7d43c8606208178 (diff)
Replace remaining occurrences of deprecated CH_* with AV_CH_*
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Diffstat (limited to 'libavcodec/mpc8.c')
-rw-r--r--libavcodec/mpc8.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/mpc8.c b/libavcodec/mpc8.c
index 327a0c02f4..865ffc1b98 100644
--- a/libavcodec/mpc8.c
+++ b/libavcodec/mpc8.c
@@ -30,6 +30,7 @@
#include "get_bits.h"
#include "dsputil.h"
#include "mpegaudio.h"
+#include "libavcore/audioconvert.h"
#include "mpc.h"
#include "mpcdata.h"
@@ -135,7 +136,7 @@ static av_cold int mpc8_decode_init(AVCodecContext * avctx)
c->frames = 1 << (get_bits(&gb, 3) * 2);
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");