Merge commit 'b2b25b0659fa047da6266d2ce165d43011136b30'

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

Michael Niedermayer committed 13 years ago

Commit ac217bd2 parents 314be19 b2b25b02 files · +2 −9Browse files

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

Unified · Split

@@ -659,6 +659,7 @@ int avfilter_init_filter(AVFilterContext filter, const char args, void *opaque · 658 unmodified lines
659	659	!strcmp(filter->filter->name, "aformat") \|\|
660	660	!strcmp(filter->filter->name, "amix" ) \|\|
661	661	!strcmp(filter->filter->name, "ass") \|\|
	662	+ !strcmp(filter->filter->name, "asyncts" ) \|\|
662	663	!strcmp(filter->filter->name, "blackframe") \|\|
663	664	!strcmp(filter->filter->name, "boxblur" ) \|\|
664	665	!strcmp(filter->filter->name, "cellauto") \|\|

Keyboard shortcuts