diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-31 23:14:08 +0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-31 23:14:08 +0300 |
commit | b80106169ab16c31e27ea464ca62b805b205d61d (patch) | |
tree | c6dfe2faf6d80c8663551c2781d458a6fa013467 /libavcodec/motion_est.c | |
parent | 3aefa1eb69c48563302d1f8869d424283b66031d (diff) |
avcodec/motion_est: Set subcmp consistently for H261
Fixes Ticket3150
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/motion_est.c')
-rw-r--r-- | libavcodec/motion_est.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c index 901fafdf26..749af72035 100644 --- a/libavcodec/motion_est.c +++ b/libavcodec/motion_est.c @@ -321,6 +321,9 @@ int ff_init_me(MpegEncContext *s){ c->avctx= s->avctx; + if(s->codec_id == AV_CODEC_ID_H261) + c->avctx->me_sub_cmp = c->avctx->me_cmp; + if(cache_size < 2*dia_size && !c->stride){ av_log(s->avctx, AV_LOG_INFO, "ME_MAP size may be a little small for the selected diamond size\n"); } |