Merge commit '4b6b1082a73907c7c3de2646c6398bc61320f2c6'

[ffmpeg.git] / libavcodec / motion_est.h

diff --git a/libavcodec/motion_est.h b/libavcodec/motion_est.h
index 199ae8d..e09f705 100644 (file)
--- a/libavcodec/motion_est.h
+++ b/libavcodec/motion_est.h
@@ -31,6 +31,10 @@ struct MpegEncContext;
 
 #define MAX_MV 4096
 
+#define FF_ME_ZERO 0
+#define FF_ME_EPZS 1
+#define FF_ME_XONE 2
+
 /**
  * Motion estimation context.
  */