diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-23 14:34:15 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-23 15:36:36 -0300 |
| commit | 7bbe33b0526723f0a20c27e3b8d03b186b27fdf6 (patch) | |
| tree | 4308d3e805275dbf3da3e1a179700b998736dd9d /libavcodec/libx264.c | |
| parent | b46613dd9b8b4adc68312a283486c33c109aab19 (diff) | |
avcodec/libx264: add me_method alias to set X264Context->motion_est
Replaces the now dropped global option.
Addresses ticket #6771.
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/libx264.c')
| -rw-r--r-- | libavcodec/libx264.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index b11ede6198..b5e04d674d 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -958,6 +958,7 @@ static const AVOption options[] = { { "vbr", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = X264_NAL_HRD_VBR}, INT_MIN, INT_MAX, VE, "nal-hrd" }, { "cbr", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = X264_NAL_HRD_CBR}, INT_MIN, INT_MAX, VE, "nal-hrd" }, { "avcintra-class","AVC-Intra class 50/100/200", OFFSET(avcintra_class),AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 200 , VE}, + { "me_method", "Set motion estimation method", OFFSET(motion_est), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, X264_ME_TESA, VE, "motion-est"}, { "motion-est", "Set motion estimation method", OFFSET(motion_est), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, X264_ME_TESA, VE, "motion-est"}, { "dia", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = X264_ME_DIA }, INT_MIN, INT_MAX, VE, "motion-est" }, { "hex", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = X264_ME_HEX }, INT_MIN, INT_MAX, VE, "motion-est" }, |