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/vorbis_data.c | |
| parent | ad3cffb68f9c77e140660a8ae7d43c8606208178 (diff) | |
| download | ffmpeg-c2fcd0a7a4d0bda1a3306e40b70ce281a987df60.tar.gz | |
Replace remaining occurrences of deprecated CH_* with AV_CH_*
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Diffstat (limited to 'libavcodec/vorbis_data.c')
| -rw-r--r-- | libavcodec/vorbis_data.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/libavcodec/vorbis_data.c b/libavcodec/vorbis_data.c index 24c9921fd1..783a5daa00 100644 --- a/libavcodec/vorbis_data.c +++ b/libavcodec/vorbis_data.c @@ -20,6 +20,7 @@ #include "dsputil.h" #include "vorbis.h" +#include "libavcore/audioconvert.h" const uint8_t ff_vorbis_channel_layout_offsets[8][8] = { { 0 }, @@ -44,14 +45,14 @@ const uint8_t ff_vorbis_encoding_channel_layout_offsets[8][8] = { }; const int64_t ff_vorbis_channel_layouts[9] = { - CH_LAYOUT_MONO, - CH_LAYOUT_STEREO, - CH_LAYOUT_SURROUND, - CH_LAYOUT_QUAD, - CH_LAYOUT_5POINT0_BACK, - CH_LAYOUT_5POINT1_BACK, - CH_LAYOUT_5POINT1|CH_BACK_CENTER, - CH_LAYOUT_7POINT1, + AV_CH_LAYOUT_MONO, + AV_CH_LAYOUT_STEREO, + AV_CH_LAYOUT_SURROUND, + AV_CH_LAYOUT_QUAD, + AV_CH_LAYOUT_5POINT0_BACK, + AV_CH_LAYOUT_5POINT1_BACK, + AV_CH_LAYOUT_5POINT1|AV_CH_BACK_CENTER, + AV_CH_LAYOUT_7POINT1, 0 }; |