OSDN Git Service
(root)
/
coroid
/
ffmpeg_saccubus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote branch 'official/master'
[coroid/ffmpeg_saccubus.git]
/
libavcodec
/
jpegls.h
diff --git
a/libavcodec/jpegls.h
b/libavcodec/jpegls.h
index
28c7524
..
2c21f77
100644
(file)
--- a/
libavcodec/jpegls.h
+++ b/
libavcodec/jpegls.h
@@
-86,6
+86,8
@@
static inline void ff_jpegls_downscale_state(JLSState *state, int Q){
}
static inline int ff_jpegls_update_state_regular(JLSState *state, int Q, int err){
+ if(FFABS(err) > 0xFFFF)
+ return -0x10000;
state->A[Q] += FFABS(err);
err *= state->twonear;
state->B[Q] += err;