From a1e52c94411de56bb1071a162524be51f32d31f0 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Sun, 15 Jul 2012 15:04:44 +0200 Subject: Simplify ptx decoding on big-endian. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Reimar Döffinger --- libavcodec/ptx.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/libavcodec/ptx.c b/libavcodec/ptx.c index d783940783..3f6c746e8c 100644 --- a/libavcodec/ptx.c +++ b/libavcodec/ptx.c @@ -58,7 +58,7 @@ static int ptx_decode_frame(AVCodecContext *avctx, void *data, int *data_size, return -1; } - avctx->pix_fmt = PIX_FMT_RGB555; + avctx->pix_fmt = PIX_FMT_RGB555LE; if (buf_end - buf < offset) return AVERROR_INVALIDDATA; @@ -85,13 +85,7 @@ static int ptx_decode_frame(AVCodecContext *avctx, void *data, int *data_size, stride = p->linesize[0]; for (y = 0; y < h && buf_end - buf >= w * bytes_per_pixel; y++) { -#if HAVE_BIGENDIAN - unsigned int x; - for (x=0; x