* commit 'b2b25b0659fa047da6266d2ce165d43011136b30': af_asyncts: switch to an AVOptions-based system. Conflicts: libavfilter/af_asyncts.c
Unified · Split
| @@ -63,14 +63,6 @@ AVFILTER_DEFINE_CLASS(asyncts); · 62 unmodified lines | |||
| 63 | static int init(AVFilterContext *ctx, const char *args) | 63 | static int init(AVFilterContext *ctx, const char *args) |
| 64 | { | 64 | { |
| 65 | ASyncContext *s = ctx->priv; | 65 | ASyncContext *s = ctx->priv; |
| 66 | int ret; | ||
| 67 | |||
| 68 | s->class = &asyncts_class; | ||
| 69 | av_opt_set_defaults(s); | ||
| 70 | |||
| 71 | if ((ret = av_set_options_string(s, args, "=", ":")) < 0) | ||
| 72 | return ret; | ||
| 73 | av_opt_free(s); | ||
| 74 | 66 | ||
| 75 | s->pts = AV_NOPTS_VALUE; | 67 | s->pts = AV_NOPTS_VALUE; |
| 76 | s->first_frame = 1; | 68 | s->first_frame = 1; |
| @@ -319,8 +311,8 @@ AVFilter avfilter_af_asyncts = { · 242 unmodified lines | |||
| 319 | .uninit = uninit, | 311 | .uninit = uninit, |
| 320 | 312 | ||
| 321 | .priv_size = sizeof(ASyncContext), | 313 | .priv_size = sizeof(ASyncContext), |
| 314 | .priv_class = &asyncts_class, | ||
| 322 | 315 | ||
| 323 | .inputs = avfilter_af_asyncts_inputs, | 316 | .inputs = avfilter_af_asyncts_inputs, |
| 324 | .outputs = avfilter_af_asyncts_outputs, | 317 | .outputs = avfilter_af_asyncts_outputs, |
| 325 | .priv_class = &asyncts_class, | ||
| 326 | }; | 318 | }; |
| @@ -659,6 +659,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque · 658 unmodified lines | |||
| 659 | !strcmp(filter->filter->name, "aformat") || | 659 | !strcmp(filter->filter->name, "aformat") || |
| 660 | !strcmp(filter->filter->name, "amix" ) || | 660 | !strcmp(filter->filter->name, "amix" ) || |
| 661 | !strcmp(filter->filter->name, "ass") || | 661 | !strcmp(filter->filter->name, "ass") || |
| 662 | !strcmp(filter->filter->name, "asyncts" ) || | ||
| 662 | !strcmp(filter->filter->name, "blackframe") || | 663 | !strcmp(filter->filter->name, "blackframe") || |
| 663 | !strcmp(filter->filter->name, "boxblur" ) || | 664 | !strcmp(filter->filter->name, "boxblur" ) || |
| 664 | !strcmp(filter->filter->name, "cellauto") || | 665 | !strcmp(filter->filter->name, "cellauto") || |