Merge commit 'd3f5b94762fb803c0f3b29f9ad6c5eaa813998ba'

[ffmpeg] / libavcodec / motion_est_template.c

diff --git a/libavcodec/motion_est_template.c b/libavcodec/motion_est_template.c
index 2fa97aa8e2436490037bbf4a499dc6eb7c7c6050..53a39c0cbeeb88fd786c27af1c09f5672a443d00 100644 (file)
--- a/libavcodec/motion_est_template.c
+++ b/libavcodec/motion_est_template.c
@@ -894,7 +894,8 @@ static av_always_inline int epzs_motion_search_internal(MpegEncContext * s, int
     score_map[0]= dmin;
 
     //FIXME precalc first term below?
-    if((s->pict_type == AV_PICTURE_TYPE_B && !(c->flags & FLAG_DIRECT)) || s->flags&CODEC_FLAG_MV0)
+    if ((s->pict_type == AV_PICTURE_TYPE_B && !(c->flags & FLAG_DIRECT)) ||
+        s->mpv_flags & FF_MPV_FLAG_MV0)
         dmin += (mv_penalty[pred_x] + mv_penalty[pred_y])*penalty_factor;
 
     /* first line */