[SCM] libav/experimental: replace endian detection hack with #ifdef WORDS_BIGENDIAN

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:01:59 UTC 2013


The following commit has been merged in the experimental branch:
commit dfdf9e78f31ee2ae81593bad5ef84c3539199b50
Author: Måns Rullgård <mans at mansr.com>
Date:   Sat Jun 16 14:52:10 2007 +0000

    replace endian detection hack with #ifdef WORDS_BIGENDIAN
    
    Originally committed as revision 9335 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/flicvideo.c b/libavcodec/flicvideo.c
index 7326b5d..d35ac0e 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;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list