[FFmpeg-cvslog] avcodec/motion_est: Set subcmp consistently for H261

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jan 31 21:14:08 2015 +0100| [b80106169ab16c31e27ea464ca62b805b205d61d] | committer: Michael Niedermayer

avcodec/motion_est: Set subcmp consistently for H261

Fixes Ticket3150

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b80106169ab16c31e27ea464ca62b805b205d61d
---

 libavcodec/motion_est.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c
index 901fafd..749af72 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");
     }