Merge commit 'b2b25b0659fa047da6266d2ce165d43011136b30'

* commit 'b2b25b0659fa047da6266d2ce165d43011136b30':
  af_asyncts: switch to an AVOptions-based system.

Conflicts:
	libavfilter/af_asyncts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavfilter/af_asyncts.c

@@ -63,14 +63,6 @@ AVFILTER_DEFINE_CLASS(asyncts);
 static int init(AVFilterContext *ctx, const char *args)
 {
     ASyncContext *s = ctx->priv;
-    int ret;
-
-    s->class = &asyncts_class;
-    av_opt_set_defaults(s);
-
-    if ((ret = av_set_options_string(s, args, "=", ":")) < 0)
-        return ret;
-    av_opt_free(s);
 
     s->pts         = AV_NOPTS_VALUE;
     s->first_frame = 1;
@@ -319,8 +311,8 @@ AVFilter avfilter_af_asyncts = {
     .uninit      = uninit,
 
     .priv_size   = sizeof(ASyncContext),
+    .priv_class  = &asyncts_class,
 
     .inputs      = avfilter_af_asyncts_inputs,
     .outputs     = avfilter_af_asyncts_outputs,
-    .priv_class = &asyncts_class,
 };

libavfilter/avfilter.c

@@ -659,6 +659,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque
         !strcmp(filter->filter->name,  "aformat") ||
         !strcmp(filter->filter->name,  "amix"      ) ||
         !strcmp(filter->filter->name,  "ass")     ||
+        !strcmp(filter->filter->name,  "asyncts"   ) ||
         !strcmp(filter->filter->name,  "blackframe") ||
         !strcmp(filter->filter->name,  "boxblur"   ) ||
         !strcmp(filter->filter->name,  "cellauto") ||