Merge commit 'f13ab29925883b4245da4129694af3af378d67be'

* commit 'f13ab29925883b4245da4129694af3af378d67be': vf_fps: switch to an AVOptions-based system. Conflicts: libavfilter/vf_fps.c

Michael Niedermayer committed 13 years ago

Commit 81c1ed72 parents b8a1f8b f13ab292 files · +2 −4Browse files

Showing the changes to libavfilter/avfilter.c (1 of 2 files). Show all

Unified · Split

@@ -666,6 +666,7 @@ int avfilter_init_filter(AVFilterContext filter, const char args, void *opaque · 665 unmodified lines
666	!strcmp(filter->filter->name, "drawtext" ) \|\|	666	!strcmp(filter->filter->name, "drawtext" ) \|\|
667	!strcmp(filter->filter->name, "fade" ) \|\|	667	!strcmp(filter->filter->name, "fade" ) \|\|
668	!strcmp(filter->filter->name, "fieldorder") \|\|	668	!strcmp(filter->filter->name, "fieldorder") \|\|
		669	!strcmp(filter->filter->name, "fps" ) \|\|
669	!strcmp(filter->filter->name, "format") \|\|	670	!strcmp(filter->filter->name, "format") \|\|
670	!strcmp(filter->filter->name, "noformat") \|\|	671	!strcmp(filter->filter->name, "noformat") \|\|
671	!strcmp(filter->filter->name, "resample")	672	!strcmp(filter->filter->name, "resample")

Keyboard shortcuts