summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-04-14 23:16:55 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-04-14 23:16:55 +0000
commitb3549d3200dfb2f6ab508c6eea2aae428f8f6223 (patch)
tree75852524df5c858e37bda1cc6c9854c32f47bd94 /libmpcodecs
parent4eaca87b8c7a8b0b489f3320568f36f42379315f (diff)
downloadmpv-b3549d3200dfb2f6ab508c6eea2aae428f8f6223.tar.bz2
mpv-b3549d3200dfb2f6ab508c6eea2aae428f8f6223.tar.xz
workaround Juanjo's stupid vme change
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5625 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r--libmpcodecs/ve_lavc.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/libmpcodecs/ve_lavc.c b/libmpcodecs/ve_lavc.c
index b9a64fb502..8a3589e7ad 100644
--- a/libmpcodecs/ve_lavc.c
+++ b/libmpcodecs/ve_lavc.c
@@ -123,10 +123,12 @@ static int config(struct vf_instance_s* vf,
lavc_venc_context.flags|= lavc_param_v4mv ? CODEC_FLAG_4MV : 0;
- /* motion estimation (0 = none ... 3 = high quality but slow) */
- /* this is just an extern from libavcodec but it should be in the
- encoder context - FIXME */
+#ifdef ME_ZERO
+ // workaround Juanjo's stupid incompatible change:
motion_estimation_method = lavc_param_vme;
+#else
+ lavc_venc_context.me_method = ME_ZERO+lavc_param_vme;
+#endif
/* fixed qscale :p */
if (lavc_param_vqscale)