diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-02-03 14:26:09 +0100 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2011-02-06 08:26:12 -0500 |
| commit | c2fcd0a7a4d0bda1a3306e40b70ce281a987df60 (patch) | |
| tree | 2f1d6751e938b53e2ae2734393079ef296666bbd /libavcodec/wavpack.c | |
| parent | ad3cffb68f9c77e140660a8ae7d43c8606208178 (diff) | |
Replace remaining occurrences of deprecated CH_* with AV_CH_*
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
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 |