On 04/29/2012 01:33 PM, Derek Buitenhuis wrote:
> + if (m->avctx->codec_id == CODEC_ID_TRUEHD &&
> + (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->codec_id == CODEC_ID_TRUEHD &&
> + (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];
> + s->ch_assign[5] = s->ch_assign[4];
> + s->ch_assign[4] = i;
> + }
(m->avctx->codec_id == CODEC_ID_TRUEHD) can be factored out of the 2
conditions.
-Justin
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
