From 4b6b1082a73907c7c3de2646c6398bc61320f2c6 Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Tue, 7 Jul 2015 01:20:43 +0100 Subject: lavc: Deprecate avctx.me_method This option is extremely codec specific and only a few codecs employ it. Move it to codec private options instead: mpegenc family supports only 3 values, xavs and x264 use 5, and xvid has a different metric entirely. Signed-off-by: Vittorio Giovara --- libavcodec/motion_est.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libavcodec/motion_est.h') diff --git a/libavcodec/motion_est.h b/libavcodec/motion_est.h index 4ffe70ed30..a5c662f8c5 100644 --- a/libavcodec/motion_est.h +++ b/libavcodec/motion_est.h @@ -31,6 +31,10 @@ struct MpegEncContext; #define MAX_MV 2048 +#define FF_ME_ZERO 0 +#define FF_ME_EPZS 1 +#define FF_ME_XONE 2 + /** * Motion estimation context. */ -- cgit v1.2.3