---
libavcodec/motion_est.c | 2 +-
libavcodec/mpegvideo.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c
index e7345d5..b0222fb 100644
--- a/libavcodec/motion_est.c
+++ b/libavcodec/motion_est.c
@@ -314,7 +314,7 @@ int ff_init_me(MpegEncContext *s){
#if FF_API_MOTION_EST
FF_DISABLE_DEPRECATION_WARNINGS
- if (s->motion_est == FF_ME_ZERO) {
+ if (s->motion_est == FF_ME_EPZS) {
if (s->me_method != ME_ZERO &&
s->me_method != ME_EPZS &&
s->me_method != ME_X1) {
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index 206eb13..cb449fa 100644
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -579,7 +579,7 @@ typedef struct MpegEncContext {
{"ibias", "intra quant bias",
FF_MPV_OFFSET(intra_quant_bias), AV_OPT_TYPE_INT, {.i64 = FF_DEFAULT_QUANT_BIAS
}, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS }, \
{"pbias", "inter quant bias",
FF_MPV_OFFSET(inter_quant_bias), AV_OPT_TYPE_INT, {.i64 = FF_DEFAULT_QUANT_BIAS
}, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS }, \
{"rc_strategy", "ratecontrol method",
FF_MPV_OFFSET(rc_strategy), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 1,
FF_MPV_OPT_FLAGS }, \
-{"motion_est", "motion estimation algorithm",
FF_MPV_OFFSET(motion_est), AV_OPT_TYPE_INT, {.i64 = FF_ME_ZERO }, 0,
FF_ME_XONE, FF_MPV_OPT_FLAGS, "motion_est" }, \
+{"motion_est", "motion estimation algorithm",
FF_MPV_OFFSET(motion_est), AV_OPT_TYPE_INT, {.i64 = FF_ME_EPZS }, FF_ME_ZERO,
FF_ME_XONE, FF_MPV_OPT_FLAGS, "motion_est" }, \
{ "zero", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_ME_ZERO }, 0, 0,
FF_MPV_OPT_FLAGS, "motion_est" }, \
{ "epzs", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_ME_EPZS }, 0, 0,
FF_MPV_OPT_FLAGS, "motion_est" }, \
{ "xone", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_ME_XONE }, 0, 0,
FF_MPV_OPT_FLAGS, "motion_est" }, \
--
1.9.5 (Apple Git-50.3)
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
