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/apedec.c | |
| parent | 6e59474b3093ea0b3193e88bae81ed764683809a (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/apedec.c')
| -rw-r--r-- | libavcodec/apedec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c index b6d6f9d9cc..e673b88bee 100644 --- a/libavcodec/apedec.c +++ b/libavcodec/apedec.c @@ -25,6 +25,7 @@ #include "dsputil.h" #include "get_bits.h" #include "bytestream.h" +#include "libavcore/audioconvert.h" /** * @file @@ -199,7 +200,7 @@ static av_cold int ape_decode_init(AVCodecContext * avctx) dsputil_init(&s->dsp, avctx); 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; return 0; } |