| Message ID | 20171023175043.3152-1-jamrial@gmail.com |
|---|---|
| State | Accepted |
| Commit | 7bbe33b0526723f0a20c27e3b8d03b186b27fdf6 |
| Headers | show |
On 10/23/17, James Almer <jamrial@gmail.com> wrote: > Replaces the now dropped global option. > > Addresses ticket #6771. > > Signed-off-by: James Almer <jamrial@gmail.com> > --- > libavcodec/libx264.c | 1 + > 1 file changed, 1 insertion(+) > > 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" }, > -- > 2.14.2 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel > lgtm
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" },
Replaces the now dropped global option. Addresses ticket #6771. Signed-off-by: James Almer <jamrial@gmail.com> --- libavcodec/libx264.c | 1 + 1 file changed, 1 insertion(+)