summaryrefslogtreecommitdiff
path: root/libavcodec/flicvideo.c
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2007-06-16 14:52:10 +0000
committerMåns Rullgård <mans@mansr.com>2007-06-16 14:52:10 +0000
commitdfdf9e78f31ee2ae81593bad5ef84c3539199b50 (patch)
treeb32bed3dda6c9787b3e08a3347e14d46fe04d839 /libavcodec/flicvideo.c
parent706da4af320bc212b537744460a8ded989b51256 (diff)
replace endian detection hack with #ifdef WORDS_BIGENDIAN
Originally committed as revision 9335 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/flicvideo.c')
-rw-r--r--libavcodec/flicvideo.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/flicvideo.c b/libavcodec/flicvideo.c
index 7326b5d8c0..d35ac0e89f 100644
--- a/libavcodec/flicvideo.c
+++ b/libavcodec/flicvideo.c
@@ -583,16 +583,14 @@ static int flic_decode_frame_15_16BPP(AVCodecContext *avctx,
* during decompression. So if it is required (i.e., this is not a LE target, we do
* a second pass over the line here, swapping the bytes.
*/
- pixel = 0xFF00;
- if (0xFF00 != AV_RL16(&pixel)) /* Check if it is not an LE target */
- {
+#ifdef WORDS_BIGENDIAN
pixel_ptr = y_ptr;
pixel_countdown = s->avctx->width;
while (pixel_countdown > 0) {
*((signed short*)(&pixels[pixel_ptr])) = AV_RL16(&buf[pixel_ptr]);
pixel_ptr += 2;
}
- }
+#endif
y_ptr += s->frame.linesize[0];
}
break;