Revision fbdcdaee libavcodec/dca.c

View differences:

libavcodec/dca.c
106 106
 * L = left, R = right, C = center, S = surround, F = front, R = rear, T = total, OV = overhead.
107 107
 * S  -> side, when both rear and back are configured move one of them to the side channel
108 108
 * OV -> center back
109
 * All 2 channel configurations -> CH_LAYOUT_STEREO
109
 * All 2 channel configurations -> AV_CH_LAYOUT_STEREO
110 110
 */
111 111

  
112 112
static const int64_t dca_core_channel_layout[] = {
......
117 117
    AV_CH_LAYOUT_STEREO,                                                     ///< 2, LT +RT (left and right total)
118 118
    AV_CH_LAYOUT_STEREO|AV_CH_FRONT_CENTER,                                  ///< 3, C+L+R
119 119
    AV_CH_LAYOUT_STEREO|AV_CH_BACK_CENTER,                                   ///< 3, L+R+S
120
    AV_CH_LAYOUT_STEREO|AV_CH_FRONT_CENTER|CH_BACK_CENTER,                   ///< 4, C + L + R+ S
120
    AV_CH_LAYOUT_STEREO|AV_CH_FRONT_CENTER|AV_CH_BACK_CENTER,                ///< 4, C + L + R+ S
121 121
    AV_CH_LAYOUT_STEREO|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT,                    ///< 4, L + R +SL+ SR
122 122
    AV_CH_LAYOUT_STEREO|AV_CH_FRONT_CENTER|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT, ///< 5, C + L + R+ SL+SR
123 123
    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

Also available in: Unified diff