diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 01:39:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 01:42:28 +0200 |
| commit | ac217bda30a79177c8a47713b3db12dc9e9bd45b (patch) | |
| tree | 79dedb63dc984965e81a5718a5a376313d75c7f4 | |
| parent | 314be1933e3a39abd6576184786703701ced4415 (diff) | |
| parent | b2b25b0659fa047da6266d2ce165d43011136b30 (diff) | |
| download | ffmpeg-ac217bda30a79177c8a47713b3db12dc9e9bd45b.tar.gz | |
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>
| -rw-r--r-- | libavfilter/af_asyncts.c | 10 | ||||
| -rw-r--r-- | libavfilter/avfilter.c | 1 |
2 files changed, 2 insertions, 9 deletions
diff --git a/libavfilter/af_asyncts.c b/libavfilter/af_asyncts.c index 244f53d3c9..8c7313a321 100644 --- a/libavfilter/af_asyncts.c +++ b/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, }; diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 497a867801..abf8cd6e41 100644 --- a/libavfilter/avfilter.c +++ b/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") || |