summaryrefslogtreecommitdiff
path: root/libavcodec/jpeg_ls.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2006-10-24 09:09:38 +0000
committerMichael Niedermayer <michaelni@gmx.at>2006-10-24 09:09:38 +0000
commit3b6d23293caf0e909575cdcea89bc1c63112b290 (patch)
tree36454c27a4b48c9ce31547b6de574346cb2cb051 /libavcodec/jpeg_ls.c
parent8d42cf7496e5b332461a07f9ec6ec20fe15d8cb6 (diff)
FFMAX
Originally committed as revision 6785 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/jpeg_ls.c')
-rw-r--r--libavcodec/jpeg_ls.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/jpeg_ls.c b/libavcodec/jpeg_ls.c
index 8dabcc06a8..b322ab7591 100644
--- a/libavcodec/jpeg_ls.c
+++ b/libavcodec/jpeg_ls.c
@@ -77,9 +77,7 @@ static void ls_init_state(JLSState *state){
state->limit = (4 * state->bpp) - state->qbpp;
for(i = 0; i < 367; i++) {
- state->A[i] = (state->range + 32) >> 6;
- if(state->A[i] < 2)
- state->A[i] = 2;
+ state->A[i] = FFMAX((state->range + 32) >> 6, 2);
state->N[i] = 1;
}