* commit 'f13ab29925883b4245da4129694af3af378d67be': vf_fps: switch to an AVOptions-based system. Conflicts: libavfilter/vf_fps.c
Unified · Split
| @@ -666,6 +666,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque · 665 unmodified lines | ||
| 666 | 666 | !strcmp(filter->filter->name, "drawtext" ) || |
| 667 | 667 | !strcmp(filter->filter->name, "fade" ) || |
| 668 | 668 | !strcmp(filter->filter->name, "fieldorder") || |
| 669 | + !strcmp(filter->filter->name, "fps" ) || | |
| 669 | 670 | !strcmp(filter->filter->name, "format") || |
| 670 | 671 | !strcmp(filter->filter->name, "noformat") || |
| 671 | 672 | !strcmp(filter->filter->name, "resample") |
| @@ -273,8 +273,6 @@ static const AVFilterPad avfilter_vf_fps_outputs[] = { · 272 unmodified lines | ||
| 273 | 273 | { NULL } |
| 274 | 274 | }; |
| 275 | 275 | |
| 276 | −static const char *const shorthand[] = { "fps", "round", NULL }; | |
| 277 | − | |
| 278 | 276 | AVFilter avfilter_vf_fps = { |
| 279 | 277 | .name = "fps", |
| 280 | 278 | .description = NULL_IF_CONFIG_SMALL("Force constant framerate"), |
| @@ -283,9 +281,8 @@ AVFilter avfilter_vf_fps = { · 2 unmodified lines | ||
| 283 | 281 | .uninit = uninit, |
| 284 | 282 | |
| 285 | 283 | .priv_size = sizeof(FPSContext), |
| 284 | + .priv_class = &fps_class, | |
| 286 | 285 | |
| 287 | 286 | .inputs = avfilter_vf_fps_inputs, |
| 288 | 287 | .outputs = avfilter_vf_fps_outputs, |
| 289 | − .priv_class = &fps_class, | |
| 290 | − .shorthand = shorthand, | |
| 291 | 288 | }; |