Revision 0aac0403

View differences:

libavcodec/mlp_parser.c
47 47
    AV_CH_LAYOUT_MONO,
48 48
    AV_CH_LAYOUT_STEREO,
49 49
    AV_CH_LAYOUT_2_1,
50
    AV_CH_LAYOUT_2_2,
50
    AV_CH_LAYOUT_QUAD,
51 51
    AV_CH_LAYOUT_STEREO|AV_CH_LOW_FREQUENCY,
52 52
    AV_CH_LAYOUT_2_1|AV_CH_LOW_FREQUENCY,
53
    AV_CH_LAYOUT_2_2|AV_CH_LOW_FREQUENCY,
53
    AV_CH_LAYOUT_QUAD|AV_CH_LOW_FREQUENCY,
54 54
    AV_CH_LAYOUT_SURROUND,
55 55
    AV_CH_LAYOUT_4POINT0,
56
    AV_CH_LAYOUT_5POINT0,
56
    AV_CH_LAYOUT_5POINT0_BACK,
57 57
    AV_CH_LAYOUT_SURROUND|AV_CH_LOW_FREQUENCY,
58 58
    AV_CH_LAYOUT_4POINT0|AV_CH_LOW_FREQUENCY,
59
    AV_CH_LAYOUT_5POINT1,
59
    AV_CH_LAYOUT_5POINT1_BACK,
60 60
    AV_CH_LAYOUT_4POINT0,
61
    AV_CH_LAYOUT_5POINT0,
61
    AV_CH_LAYOUT_5POINT0_BACK,
62 62
    AV_CH_LAYOUT_SURROUND|AV_CH_LOW_FREQUENCY,
63 63
    AV_CH_LAYOUT_4POINT0|AV_CH_LOW_FREQUENCY,
64
    AV_CH_LAYOUT_5POINT1,
65
    AV_CH_LAYOUT_2_2|AV_CH_LOW_FREQUENCY,
66
    AV_CH_LAYOUT_5POINT0,
67
    AV_CH_LAYOUT_5POINT1,
64
    AV_CH_LAYOUT_5POINT1_BACK,
65
    AV_CH_LAYOUT_QUAD|AV_CH_LOW_FREQUENCY,
66
    AV_CH_LAYOUT_5POINT0_BACK,
67
    AV_CH_LAYOUT_5POINT1_BACK,
68 68
    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
69 69
};
70 70

  
libavcodec/mlpdec.c
459 459
    }
460 460

  
461 461
    if (m->avctx->codec_id == CODEC_ID_MLP && m->needs_reordering) {
462
        if (m->avctx->channel_layout == (AV_CH_LAYOUT_2_2|AV_CH_LOW_FREQUENCY) ||
463
            m->avctx->channel_layout == AV_CH_LAYOUT_5POINT0) {
462
        if (m->avctx->channel_layout == (AV_CH_LAYOUT_QUAD|AV_CH_LOW_FREQUENCY) ||
463
            m->avctx->channel_layout == AV_CH_LAYOUT_5POINT0_BACK) {
464 464
            int i = s->ch_assign[4];
465 465
            s->ch_assign[4] = s->ch_assign[3];
466 466
            s->ch_assign[3] = s->ch_assign[2];
467 467
            s->ch_assign[2] = i;
468
        } else if (m->avctx->channel_layout == AV_CH_LAYOUT_5POINT1) {
468
        } else if (m->avctx->channel_layout == AV_CH_LAYOUT_5POINT1_BACK) {
469 469
            FFSWAP(int, s->ch_assign[2], s->ch_assign[4]);
470 470
            FFSWAP(int, s->ch_assign[3], s->ch_assign[5]);
471 471
        }

Also available in: Unified diff