aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-03-21 18:29:16 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-03-23 20:31:05 +0100
commit72a12f61ef66b9d401a9acbff62c9791f21ac045 (patch)
tree5240dab363cb8564d484ff37acf37cb8c114dfbe /libavcodec
parent30ae080e9dec37269828bcab24937cf3ccc80078 (diff)
downloadffmpeg-72a12f61ef66b9d401a9acbff62c9791f21ac045.tar.gz
avcodec/snowenc: allow larger mb variances
Fixes assertion failure Fixes Ticket3463 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 2fd14f062cfc52db1529a46b53a26b06cb418f55) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/snowenc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c
index 517728586a..ed331de346 100644
--- a/libavcodec/snowenc.c
+++ b/libavcodec/snowenc.c
@@ -1502,8 +1502,8 @@ static int ratecontrol_1pass(SnowContext *s, AVFrame *pict)
}
/* ugly, ratecontrol just takes a sqrt again */
- coef_sum = (uint64_t)coef_sum * coef_sum >> 16;
av_assert0(coef_sum < INT_MAX);
+ coef_sum = (uint64_t)coef_sum * coef_sum >> 16;
if(pict->pict_type == AV_PICTURE_TYPE_I){
s->m.current_picture.mb_var_sum= coef_sum;