summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2012-07-15 15:04:44 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2012-07-15 15:04:44 +0200
commita1e52c94411de56bb1071a162524be51f32d31f0 (patch)
treec0731f850cdfb941ba6dbe88433f451bf346005d /libavcodec
parenta8ff7e3f96772341af22e10d394fbe83c9ffdb0b (diff)
Simplify ptx decoding on big-endian.
Reviewed-by: Reimar Döffinger
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/ptx.c8
1 files changed, 1 insertions, 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<w*bytes_per_pixel; x+=bytes_per_pixel)
- AV_WN16(ptr+x, AV_RL16(buf+x));
-#else
memcpy(ptr, buf, w*bytes_per_pixel);
-#endif
ptr += stride;
buf += w*bytes_per_pixel;
}