Merge commit '3f14febbdf7c93bbd186399da27991180e5916b6'

* commit '3f14febbdf7c93bbd186399da27991180e5916b6': af_channelsplit: switch to an AVOptions-based system. Conflicts: libavfilter/af_channelsplit.c

Michael Niedermayer committed 13 years ago

Commit f17651b2 parents d9d7c54 3f14feb2 files · +2 −6Browse files

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

Unified · Split

@@ -668,6 +668,7 @@ int avfilter_init_filter(AVFilterContext filter, const char args, void *opaque · 667 unmodified lines
668	!strcmp(filter->filter->name, "boxblur" ) \|\|	668	!strcmp(filter->filter->name, "boxblur" ) \|\|
669	!strcmp(filter->filter->name, "cellauto") \|\|	669	!strcmp(filter->filter->name, "cellauto") \|\|
670	!strcmp(filter->filter->name, "channelmap") \|\|	670	!strcmp(filter->filter->name, "channelmap") \|\|
		671	!strcmp(filter->filter->name, "channelsplit") \|\|
671	!strcmp(filter->filter->name, "colormatrix") \|\|	672	!strcmp(filter->filter->name, "colormatrix") \|\|
672	!strcmp(filter->filter->name, "crop" ) \|\|	673	!strcmp(filter->filter->name, "crop" ) \|\|
673	!strcmp(filter->filter->name, "cropdetect") \|\|	674	!strcmp(filter->filter->name, "cropdetect") \|\|

@@ -668,6 +668,7 @@ int avfilter_init_filter(AVFilterContext filter, const char args, void *opaque · 667 unmodified lines
668	!strcmp(filter->filter->name, "boxblur" ) \|\|	668	!strcmp(filter->filter->name, "boxblur" ) \|\|
669	!strcmp(filter->filter->name, "cellauto") \|\|	669	!strcmp(filter->filter->name, "cellauto") \|\|
670	!strcmp(filter->filter->name, "channelmap") \|\|	670	!strcmp(filter->filter->name, "channelmap") \|\|
		671	!strcmp(filter->filter->name, "channelsplit") \|\|
671	!strcmp(filter->filter->name, "colormatrix") \|\|	672	!strcmp(filter->filter->name, "colormatrix") \|\|
672	!strcmp(filter->filter->name, "crop" ) \|\|	673	!strcmp(filter->filter->name, "crop" ) \|\|
673	!strcmp(filter->filter->name, "cropdetect") \|\|	674	!strcmp(filter->filter->name, "cropdetect") \|\|

Keyboard shortcuts