diff options
| author | Steve Kondik <steve@cyngn.com> | 2016-01-18 00:49:02 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-01-18 00:49:02 -0800 |
| commit | a86ba6643fd348ab473be955a0c57714665345d9 (patch) | |
| tree | 2457c1aed6ce52de181e1c9b383890734ade6c4a /libavcodec/snowenc.c | |
| parent | c09118c500be0aa1e10113d18e21d38e63722e5a (diff) | |
| parent | b8fa3ff95d884060f39c5d50e811404fe94b9301 (diff) | |
| download | android_external_ffmpeg-cm-13.0-old.tar.gz android_external_ffmpeg-cm-13.0-old.tar.bz2 android_external_ffmpeg-cm-13.0-old.zip | |
Merge branch 'release/2.8' of https://github.com/FFmpeg/FFmpeg into cm-13.0cm-13.0-old
Diffstat (limited to 'libavcodec/snowenc.c')
| -rw-r--r-- | libavcodec/snowenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index 5e5dc35e86..6757971ce3 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -291,7 +291,7 @@ static int encode_q_branch(SnowContext *s, int level, int x, int y){ c->penalty_factor = get_penalty_factor(s->lambda, s->lambda2, c->avctx->me_cmp); c->sub_penalty_factor= get_penalty_factor(s->lambda, s->lambda2, c->avctx->me_sub_cmp); c->mb_penalty_factor = get_penalty_factor(s->lambda, s->lambda2, c->avctx->mb_cmp); - c->current_mv_penalty= c->mv_penalty[s->m.f_code=1] + MAX_MV; + c->current_mv_penalty= c->mv_penalty[s->m.f_code=1] + MAX_DMV; c->xmin = - x*block_w - 16+3; c->ymin = - y*block_w - 16+3; |