aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/dca.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-02-03 14:26:09 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-02-06 20:31:47 +0100
commitfbdcdaee6e458103bbb2e489b62fa5670ffa4b24 (patch)
treee6851bd6403c454bfaa27e331d7e01cd2817bd81 /libavcodec/dca.c
parent6e59474b3093ea0b3193e88bae81ed764683809a (diff)
downloadffmpeg-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/dca.c')
-rw-r--r--libavcodec/dca.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/dca.c b/libavcodec/dca.c
index 63ea32992e..67195b1917 100644
--- a/libavcodec/dca.c
+++ b/libavcodec/dca.c
@@ -106,7 +106,7 @@ enum DCAExtensionMask {
* L = left, R = right, C = center, S = surround, F = front, R = rear, T = total, OV = overhead.
* S -> side, when both rear and back are configured move one of them to the side channel
* OV -> center back
- * All 2 channel configurations -> CH_LAYOUT_STEREO
+ * All 2 channel configurations -> AV_CH_LAYOUT_STEREO
*/
static const int64_t dca_core_channel_layout[] = {
@@ -117,7 +117,7 @@ static const int64_t dca_core_channel_layout[] = {
AV_CH_LAYOUT_STEREO, ///< 2, LT +RT (left and right total)
AV_CH_LAYOUT_STEREO|AV_CH_FRONT_CENTER, ///< 3, C+L+R
AV_CH_LAYOUT_STEREO|AV_CH_BACK_CENTER, ///< 3, L+R+S
- AV_CH_LAYOUT_STEREO|AV_CH_FRONT_CENTER|CH_BACK_CENTER, ///< 4, C + L + R+ S
+ AV_CH_LAYOUT_STEREO|AV_CH_FRONT_CENTER|AV_CH_BACK_CENTER, ///< 4, C + L + R+ S
AV_CH_LAYOUT_STEREO|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT, ///< 4, L + R +SL+ SR
AV_CH_LAYOUT_STEREO|AV_CH_FRONT_CENTER|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT, ///< 5, C + L + R+ SL+SR
AV_CH_LAYOUT_STEREO|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER, ///< 6, CL + CR + L + R + SL + SR