OSDN Git Service
(root)
/
coroid
/
libav_saccubus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7f4a1e8
)
Factor code&0xf out of if() in decode_block_progressive().
author
Michael Niedermayer
<michaelni@gmx.at>
Thu, 21 Oct 2010 22:44:37 +0000
(22:44 +0000)
committer
Michael Niedermayer
<michaelni@gmx.at>
Thu, 21 Oct 2010 22:44:37 +0000
(22:44 +0000)
Originally committed as revision 25544 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavcodec/mjpegdec.c
patch
|
blob
|
history
diff --git
a/libavcodec/mjpegdec.c
b/libavcodec/mjpegdec.c
index
5bf9f31
..
7d1aa53
100644
(file)
--- 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)
}