diff options
| author | Paul B Mahol <onemda@gmail.com> | 2012-03-27 05:15:20 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-27 05:32:07 +0400 |
| commit | 0f3886fa7d7cb5280c0468d9a778511d5bf15085 (patch) | |
| tree | f0fd178c4c4492058023c252c884c0f66e512fdc /libavcodec/j2kdec.c | |
| parent | ebbf10efb06a03df97617759200c391bb2c61004 (diff) | |
j2kdec: remove pointless swapping
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/j2kdec.c')
| -rw-r--r-- | libavcodec/j2kdec.c | 5 |
1 files changed, 1 insertions, 4 deletions
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; |