diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-10-14 22:51:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-11-09 13:46:19 +0100 |
| commit | 8802e329c8317ca5ceb929df48a23eb0f9e852b2 (patch) | |
| tree | b904c94706a54488bf1f06f6f95a568d5647f3a0 /libavcodec | |
| parent | bb190ded678a0ad8fc365af897b042c9dd013936 (diff) | |
| download | ffmpeg-8802e329c8317ca5ceb929df48a23eb0f9e852b2.tar.gz | |
avcodec/snowenc: Fix 2 undefined shifts
Fixes: Ticket7990
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/snowenc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index df1729a083..4166ce4e1d 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -312,7 +312,7 @@ static int encode_q_branch(SnowContext *s, int level, int x, int y){ if(P_LEFT[1] > (c->ymax<<shift)) P_LEFT[1] = (c->ymax<<shift); if(P_TOP[0] > (c->xmax<<shift)) P_TOP[0] = (c->xmax<<shift); if(P_TOP[1] > (c->ymax<<shift)) P_TOP[1] = (c->ymax<<shift); - if(P_TOPRIGHT[0] < (c->xmin<<shift)) P_TOPRIGHT[0]= (c->xmin<<shift); + if(P_TOPRIGHT[0] < (c->xmin * (1<<shift))) P_TOPRIGHT[0]= (c->xmin * (1<<shift)); if(P_TOPRIGHT[0] > (c->xmax<<shift)) P_TOPRIGHT[0]= (c->xmax<<shift); //due to pmx no clip if(P_TOPRIGHT[1] > (c->ymax<<shift)) P_TOPRIGHT[1]= (c->ymax<<shift); @@ -1774,7 +1774,7 @@ FF_ENABLE_DEPRECATION_WARNINGS }else{ for(y=0; y<h; y++){ for(x=0; x<w; x++){ - s->spatial_dwt_buffer[y*w + x]=s->spatial_idwt_buffer[y*w + x]<<ENCODER_EXTRA_BITS; + s->spatial_dwt_buffer[y*w + x]= s->spatial_idwt_buffer[y*w + x] * (1 << ENCODER_EXTRA_BITS); } } } |