diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-02-03 14:26:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-02-06 20:31:47 +0100 |
| commit | fbdcdaee6e458103bbb2e489b62fa5670ffa4b24 (patch) | |
| tree | e6851bd6403c454bfaa27e331d7e01cd2817bd81 /libavcodec/mpc7.c | |
| parent | 6e59474b3093ea0b3193e88bae81ed764683809a (diff) | |
| download | android_external_ffmpeg-fbdcdaee6e458103bbb2e489b62fa5670ffa4b24.tar.gz android_external_ffmpeg-fbdcdaee6e458103bbb2e489b62fa5670ffa4b24.tar.bz2 android_external_ffmpeg-fbdcdaee6e458103bbb2e489b62fa5670ffa4b24.zip | |
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/mpc7.c')
| -rw-r--r-- | libavcodec/mpc7.c | 3 |
1 files changed, 2 insertions, 1 deletions
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"); |