diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2013-04-11 14:39:37 +0200 |
|---|---|---|
| committer | Clément Bœsch <ubitux@gmail.com> | 2013-04-11 14:40:02 +0200 |
| commit | 7eb1ea2ae672da791d637be0e3aad44db7df16d3 (patch) | |
| tree | cc3cbb8bfb3243f523e1cf21829686e2052d3dd2 | |
| parent | 389eb0a919954e6c91dbc47a5aefc40edbd84b25 (diff) | |
| download | ffmpeg-7eb1ea2ae672da791d637be0e3aad44db7df16d3.tar.gz | |
lavfi/sendcmd: switch to an AVOptions-based system.
| -rw-r--r-- | libavfilter/avfilter.c | 2 | ||||
| -rw-r--r-- | libavfilter/f_sendcmd.c | 14 |
2 files changed, 3 insertions, 13 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index c3336243f1..5604ba53b0 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -678,7 +678,6 @@ static const char *const filters_left_to_update[] = { "amerge", "anullsrc", "aresample", - "asendcmd", "asetnsamples", "astreamsync", "atempo", @@ -691,7 +690,6 @@ static const char *const filters_left_to_update[] = { "pan", "removelogo", "scale", - "sendcmd", "setdar", "setsar", }; diff --git a/libavfilter/f_sendcmd.c b/libavfilter/f_sendcmd.c index a5a5f2e695..28c8bfc0e9 100644 --- a/libavfilter/f_sendcmd.c +++ b/libavfilter/f_sendcmd.c @@ -368,17 +368,11 @@ static int cmp_intervals(const void *a, const void *b) return ret == 0 ? i1->index - i2->index : ret; } -static av_cold int init(AVFilterContext *ctx, const char *args, const AVClass *class) +static av_cold int init(AVFilterContext *ctx) { SendCmdContext *sendcmd = ctx->priv; int ret, i, j; - sendcmd->class = class; - av_opt_set_defaults(sendcmd); - - if ((ret = av_set_options_string(sendcmd, args, "=", ":")) < 0) - return ret; - if (sendcmd->commands_filename && sendcmd->commands_str) { av_log(ctx, AV_LOG_ERROR, "Only one of the filename or commands options must be specified\n"); @@ -433,8 +427,6 @@ static void av_cold uninit(AVFilterContext *ctx) SendCmdContext *sendcmd = ctx->priv; int i, j; - av_opt_free(sendcmd); - for (i = 0; i < sendcmd->nb_intervals; i++) { Interval *interval = &sendcmd->intervals[i]; for (j = 0; j < interval->nb_commands; j++) { @@ -520,7 +512,7 @@ AVFILTER_DEFINE_CLASS(sendcmd); static av_cold int sendcmd_init(AVFilterContext *ctx, const char *args) { - return init(ctx, args, &sendcmd_class); + return init(ctx); } static const AVFilterPad sendcmd_inputs[] = { @@ -562,7 +554,7 @@ AVFILTER_DEFINE_CLASS(asendcmd); static av_cold int asendcmd_init(AVFilterContext *ctx, const char *args) { - return init(ctx, args, &asendcmd_class); + return init(ctx); } static const AVFilterPad asendcmd_inputs[] = { |