xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2025-01-27 06:54:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

avcodec/motion_est: Fix undefined shifts in cmp_inline()

Browse Source 
Fixes: signal_sigsegv_35eac16_2762_cov_2704249783_missing_frames.avi

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-07-01 13:41:26 +02:00
parent 0ea099ad3e
commit 4eee685a21
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/motion_est.c
View File

@ -183,8 +183,8 @@ static av_always_inline int cmp_inline(MpegEncContext *s, const int x, const int
const int stride= c->stride; const int stride= c->stride;
const int uvstride= c->uvstride; const int uvstride= c->uvstride;
const int dxy= subx + (suby<<(1+qpel)); //FIXME log2_subpel? const int dxy= subx + (suby<<(1+qpel)); //FIXME log2_subpel?
const int hx= subx + (x<<(1+qpel)); const int hx= subx + x*(1<<(1+qpel));
const int hy= suby + (y<<(1+qpel)); const int hy= suby + y*(1<<(1+qpel));
uint8_t * const * const ref= c->ref[ref_index]; uint8_t * const * const ref= c->ref[ref_index];
uint8_t * const * const src= c->src[src_index]; uint8_t * const * const src= c->src[src_index];
int d; int d;