diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 19:21:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 19:21:59 +0200 |
| commit | 81c1ed748be53da95c2dbda4e16794afcf0851b3 (patch) | |
| tree | 243ace87a2748ac60899bc7491901e3a2e03fa3c | |
| parent | b8a1f8b4e28b4ff85aae8fdedf586d60f0514118 (diff) | |
| parent | f13ab29925883b4245da4129694af3af378d67be (diff) | |
| download | ffmpeg-81c1ed748be53da95c2dbda4e16794afcf0851b3.tar.gz | |
Merge commit 'f13ab29925883b4245da4129694af3af378d67be'
* commit 'f13ab29925883b4245da4129694af3af378d67be':
vf_fps: switch to an AVOptions-based system.
Conflicts:
libavfilter/vf_fps.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavfilter/avfilter.c | 1 | ||||
| -rw-r--r-- | libavfilter/vf_fps.c | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 84a6f01973..dd0df50eeb 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -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") diff --git a/libavfilter/vf_fps.c b/libavfilter/vf_fps.c index 9ff69e1649..d9f610a00a 100644 --- a/libavfilter/vf_fps.c +++ b/libavfilter/vf_fps.c @@ -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, }; |