Revision 0aac0403 libavcodec/mlpdec.c

View differences:

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