[SCM] libav/experimental: Move if() in mjpeg decode_block() to simplify condition.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 17:17:58 UTC 2013
The following commit has been merged in the experimental branch:
commit 76c80ef5690c6b94ad7468cd170a7519295b8d19
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Thu Oct 21 22:44:28 2010 +0000
Move if() in mjpeg decode_block() to simplify condition.
Originally committed as revision 25541 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 4dcbfdb..fe08d7b 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -412,8 +412,8 @@ static int decode_block(MJpegDecodeContext *s, DCTELEM *block,
if (code == 0x10)
break;
i += ((unsigned)code) >> 4;
- if(code != 0x100){
code &= 0xf;
+ if(code){
if(code > MIN_CACHE_BITS - 16){
UPDATE_CACHE(re, &s->gb)
}
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list