[SCM] libav/experimental: Factor code&0xf out of if() in decode_block_progressive().

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 8870b2514054f50ce35a6d6717dd44db6595e764
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Thu Oct 21 22:44:37 2010 +0000

    Factor code&0xf out of if() in decode_block_progressive().
    
    Originally committed as revision 25544 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 5bf9f31..7d1aa53 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -477,9 +477,9 @@ static int decode_block_progressive(MJpegDecodeContext *s, DCTELEM *block, uint8
         /* Progressive JPEG use AC coeffs from zero and this decoder sets offset 16 by default */
         code -= 16;
         run = ((unsigned) code) >> 4;
-        if(code & 0xF) {
+        code &= 0xF;
+        if(code) {
             i += run;
-            code &= 0xf;
             if(code > MIN_CACHE_BITS - 16){
                 UPDATE_CACHE(re, &s->gb)
             }

-- 
Libav/FFmpeg packaging