diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-21 18:25:36 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-21 18:34:54 +0100 |
commit | b4356c9cc28197bb8da626ece08d4a062b62afc8 (patch) | |
tree | 585887851dd6e324c59d81da57196db850ae7f2b /libavcodec/ratecontrol.h | |
parent | e92a78a4095d69d876bef189225608a35166dc4a (diff) | |
download | ffmpeg-b4356c9cc28197bb8da626ece08d4a062b62afc8.tar.gz |
avcodec/ratecontrol: make (mc_)mb_var_sum(_last) 64bit
This avoids hypothetical integer overflows
Diffstat (limited to 'libavcodec/ratecontrol.h')
-rw-r--r-- | libavcodec/ratecontrol.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/ratecontrol.h b/libavcodec/ratecontrol.h index 959b6a2353..eeb4bb96c0 100644 --- a/libavcodec/ratecontrol.h +++ b/libavcodec/ratecontrol.h @@ -49,8 +49,8 @@ typedef struct RateControlEntry{ uint64_t expected_bits; int new_pict_type; float new_qscale; - int mc_mb_var_sum; - int mb_var_sum; + int64_t mc_mb_var_sum; + int64_t mb_var_sum; int i_count; int skip_count; int f_code; @@ -71,8 +71,8 @@ typedef struct RateControlContext{ double pass1_wanted_bits; ///< bits which should have been outputed by the pass1 code (including complexity init) double last_qscale; double last_qscale_for[5]; ///< last qscale for a specific pict type, used for max_diff & ipb factor stuff - int last_mc_mb_var_sum; - int last_mb_var_sum; + int64_t last_mc_mb_var_sum; + int64_t last_mb_var_sum; uint64_t i_cplx_sum[5]; uint64_t p_cplx_sum[5]; uint64_t mv_bits_sum[5]; |