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/wavpack.c | |
| parent | 6e59474b3093ea0b3193e88bae81ed764683809a (diff) | |
| download | ffmpeg-fbdcdaee6e458103bbb2e489b62fa5670ffa4b24.tar.gz | |
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/wavpack.c')
| -rw-r--r-- | libavcodec/wavpack.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c index e96981460b..ffb5018c57 100644 --- a/libavcodec/wavpack.c +++ b/libavcodec/wavpack.c @@ -22,6 +22,7 @@ #include "avcodec.h" #include "get_bits.h" #include "unary.h" +#include "libavcore/audioconvert.h" /** * @file @@ -706,7 +707,7 @@ static av_cold int wavpack_decode_init(AVCodecContext *avctx) else avctx->sample_fmt = AV_SAMPLE_FMT_S32; if(avctx->channels <= 2 && !avctx->channel_layout) - 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; s->multichannel = avctx->channels > 2; /* lavf demuxer does not provide extradata, Matroska stores 0x403 |