On 04/29/2012 02:16 PM, Derek Buitenhuis wrote:
> + int i = s->ch_assign[4];
> + s->ch_assign[4] = s->ch_assign[3];
align those vertically.
> + s->ch_assign[3] = s->ch_assign[2];
> + s->ch_assign[2] = i;
> + } else if (m->avctx->channel_layout == AV_CH_LAYOUT_5POINT1_BACK) {
> + FFSWAP(int, s->ch_assign[2], s->ch_assign[4]);
> + FFSWAP(int, s->ch_assign[3], s->ch_assign[5]);
> + }
> + }
> + if (m->avctx->codec_id == CODEC_ID_TRUEHD) {
> + if (m->avctx->channel_layout == AV_CH_LAYOUT_7POINT1 ||
> + m->avctx->channel_layout == AV_CH_LAYOUT_7POINT1_WIDE) {
> + FFSWAP(int, s->ch_assign[4], s->ch_assign[6]);
> + FFSWAP(int, s->ch_assign[5], s->ch_assign[7]);
> + } else if (m->avctx->channel_layout == AV_CH_LAYOUT_6POINT1 ||
> + m->avctx->channel_layout == (AV_CH_LAYOUT_6POINT1 |
> AV_CH_TOP_CENTER) ||
> + m->avctx->channel_layout == (AV_CH_LAYOUT_6POINT1 |
> AV_CH_TOP_FRONT_CENTER)) {
> + int i = s->ch_assign[6];
> + s->ch_assign[6] = s->ch_assign[5];
and those.
> + s->ch_assign[5] = s->ch_assign[4];
> + s->ch_assign[4] = i;
and the patch looks ok.
Thanks,
Justin
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
