Merge commit 'b9dfee9fa259dfc885508179a359dccc9e7840bd'

* commit 'b9dfee9fa259dfc885508179a359dccc9e7840bd': vf_fade: switch to an AVOptions-based system. Conflicts: doc/filters.texi libavfilter/vf_fade.c

Michael Niedermayer committed 13 years ago

Commit 0c3d7062 parents d70b494 b9dfee93 files · +44 −41Browse files

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

Unified · Split

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

Keyboard shortcuts