diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-21 18:12:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-23 20:31:05 +0100 |
| commit | 25b462cab9493e7a50a5fe0602895a3a9554f5a8 (patch) | |
| tree | 59d5dc9114cc2ba044d05143bc795762b231f212 /libavcodec | |
| parent | 7c6a8afa7ea7fac599f81eb3c490e71e03944378 (diff) | |
| download | ffmpeg-25b462cab9493e7a50a5fe0602895a3a9554f5a8.tar.gz | |
avcodec/mpegvideo: make mc_mb_var_sum_temp / mb_var_sum_temp 64bit
This avoids a hypothetical integer overflow with very high resolution video
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c3272674c943474ec6bfcd75e0d9b4b4ca95ff32)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mpegvideo.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 8f7de9e90c..14a443985b 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -251,8 +251,8 @@ typedef struct MotionEstContext{ int stride; int uvstride; /* temp variables for picture complexity calculation */ - int mc_mb_var_sum_temp; - int mb_var_sum_temp; + int64_t mc_mb_var_sum_temp; + int64_t mb_var_sum_temp; int scene_change_score; /* cmp, chroma_cmp;*/ op_pixels_func (*hpel_put)[4]; |