virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

dnxhdenc: fix signed overflows

Browse Source 
Signed-off-by: Mans Rullgard <mans@mansr.com>
This commit is contained in:
Mans Rullgard 2011-11-26 20:11:12 +00:00
parent b6ae086682
commit 3a83b2461e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/dnxhdenc.c
View File

@ -682,7 +682,8 @@ static int dnxhd_encode_rdo(AVCodecContext *avctx, DNXHDEncContext *ctx)
int qscale = 1; int qscale = 1;
int mb = y*ctx->m.mb_width+x; int mb = y*ctx->m.mb_width+x;
for (q = 1; q < avctx->qmax; q++) { for (q = 1; q < avctx->qmax; q++) {
unsigned score = ctx->mb_rc[q][mb].bits*lambda+(ctx->mb_rc[q][mb].ssd<<LAMBDA_FRAC_BITS); unsigned score = ctx->mb_rc[q][mb].bits*lambda+
((unsigned)ctx->mb_rc[q][mb].ssd<<LAMBDA_FRAC_BITS);
if (score < min) { if (score < min) {
min = score; min = score;
qscale = q; qscale = q;
@ -709,7 +710,7 @@ static int dnxhd_encode_rdo(AVCodecContext *avctx, DNXHDEncContext *ctx)
lambda = (lambda+last_higher)>>1; lambda = (lambda+last_higher)>>1;
else else
lambda -= down_step; lambda -= down_step;
down_step *= 5; // XXX tune ? down_step = FFMIN((int64_t)down_step*5, INT_MAX);
up_step = 1<<LAMBDA_FRAC_BITS; up_step = 1<<LAMBDA_FRAC_BITS;
lambda = FFMAX(1, lambda); lambda = FFMAX(1, lambda);
if (lambda == last_lower) if (lambda == last_lower)