Replace remaining occurrences of deprecated CH_* with AV_CH_*

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit c2fcd0a7a4)
This commit is contained in:
Anton Khirnov 2011-02-03 14:26:09 +01:00 • committed by Michael Niedermayer
parent 6e59474b30
commit fbdcdaee6e
14 changed files with 34 additions and 21 deletions

View file

@ -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
};