Commit 81c1ed74 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'f13ab299'

* commit 'f13ab299':
  vf_fps: switch to an AVOptions-based system.

Conflicts:
	libavfilter/vf_fps.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents b8a1f8b4 f13ab299
......@@ -666,6 +666,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque
!strcmp(filter->filter->name, "drawtext" ) ||
!strcmp(filter->filter->name, "fade" ) ||
!strcmp(filter->filter->name, "fieldorder") ||
!strcmp(filter->filter->name, "fps" ) ||
!strcmp(filter->filter->name, "format") ||
!strcmp(filter->filter->name, "noformat") ||
!strcmp(filter->filter->name, "resample")
......
......@@ -273,8 +273,6 @@ static const AVFilterPad avfilter_vf_fps_outputs[] = {
{ NULL }
};
static const char *const shorthand[] = { "fps", "round", NULL };
AVFilter avfilter_vf_fps = {
.name = "fps",
.description = NULL_IF_CONFIG_SMALL("Force constant framerate"),
......@@ -283,9 +281,8 @@ AVFilter avfilter_vf_fps = {
.uninit = uninit,
.priv_size = sizeof(FPSContext),
.priv_class = &fps_class,
.inputs = avfilter_vf_fps_inputs,
.outputs = avfilter_vf_fps_outputs,
.priv_class = &fps_class,
.shorthand = shorthand,
};
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment