From 0f3886fa7d7cb5280c0468d9a778511d5bf15085 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Tue, 27 Mar 2012 01:15:20 +0000 Subject: j2kdec: remove pointless swapping Signed-off-by: Paul B Mahol Signed-off-by: Michael Niedermayer --- libavcodec/j2kdec.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'libavcodec/j2kdec.c') diff --git a/libavcodec/j2kdec.c b/libavcodec/j2kdec.c index 8d0b643d96..6a4b2b6ad8 100644 --- a/libavcodec/j2kdec.c +++ b/libavcodec/j2kdec.c @@ -269,7 +269,7 @@ static int get_siz(J2kDecoderContext *s) } break; case 4: - s->avctx->pix_fmt = PIX_FMT_BGRA; + s->avctx->pix_fmt = PIX_FMT_RGBA; break; } @@ -848,9 +848,6 @@ static int decode_tile(J2kDecoderContext *s, J2kTile *tile) if (tile->codsty[0].mct) mct_decode(s, tile); - if (s->avctx->pix_fmt == PIX_FMT_BGRA) // RGBA -> BGRA - FFSWAP(int *, src[0], src[2]); - if (s->precision <= 8) { for (compno = 0; compno < s->ncomponents; compno++){ y = tile->comp[compno].coord[1][0] - s->image_offset_y; -- cgit v1.2.3