diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-27 21:03:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-27 21:03:20 +0200 |
| commit | 0b6f092ed31b83e01e980b596ef8bdd9db6cfff6 (patch) | |
| tree | 844a58a9d243b289647cb6693b9102bff7b4f6ec /libavcodec/motion_est.h | |
| parent | 59b009411fcc8531d661a381bbd2608e36c20bd0 (diff) | |
| parent | 4b6b1082a73907c7c3de2646c6398bc61320f2c6 (diff) | |
| download | ffmpeg-0b6f092ed31b83e01e980b596ef8bdd9db6cfff6.tar.gz | |
Merge commit '4b6b1082a73907c7c3de2646c6398bc61320f2c6'
* commit '4b6b1082a73907c7c3de2646c6398bc61320f2c6':
lavc: Deprecate avctx.me_method
Conflicts:
doc/encoders.texi
libavcodec/avcodec.h
libavcodec/libx264.c
libavcodec/motion_est.c
libavcodec/options_table.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/motion_est.h')
| -rw-r--r-- | libavcodec/motion_est.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/motion_est.h b/libavcodec/motion_est.h index 199ae8da90..e09f705eee 100644 --- 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. */ |