History

lavfi/sendcmd: switch to an AVOptions-based system.

Clément Bœsch committed 13 years ago

Commit 7eb1ea21 parent 389eb0a2 files · +3 −13Browse files

Unified · Split

2 files
  1. libavfilter/avfilter.c +0 −2
  2. libavfilter/f_sendcmd.c +3 −11
libavfilter/avfilter.c+0−2
@@ -678,7 +678,6 @@ static const char *const filters_left_to_update[] = { · 677 unmodified lines
678678 "amerge",
679679 "anullsrc",
680680 "aresample",
681− "asendcmd",
682681 "asetnsamples",
683682 "astreamsync",
684683 "atempo",
@@ -691,7 +690,6 @@ static const char *const filters_left_to_update[] = { · 6 unmodified lines
691690 "pan",
692691 "removelogo",
693692 "scale",
694− "sendcmd",
695693 "setdar",
696694 "setsar",
697695 };
libavfilter/f_sendcmd.c+3−11
@@ -368,17 +368,11 @@ static int cmp_intervals(const void *a, const void *b) · 367 unmodified lines
368368 return ret == 0 ? i1->index - i2->index : ret;
369369 }
370370
371−static av_cold int init(AVFilterContext *ctx, const char *args, const AVClass *class)
371+static av_cold int init(AVFilterContext *ctx)
372372 {
373373 SendCmdContext *sendcmd = ctx->priv;
374374 int ret, i, j;
375375
376− sendcmd->class = class;
377− av_opt_set_defaults(sendcmd);
378−
379− if ((ret = av_set_options_string(sendcmd, args, "=", ":")) < 0)
380− return ret;
381−
382376 if (sendcmd->commands_filename && sendcmd->commands_str) {
383377 av_log(ctx, AV_LOG_ERROR,
384378 "Only one of the filename or commands options must be specified\n");
@@ -433,8 +427,6 @@ static void av_cold uninit(AVFilterContext *ctx) · 48 unmodified lines
433427 SendCmdContext *sendcmd = ctx->priv;
434428 int i, j;
435429
436− av_opt_free(sendcmd);
437−
438430 for (i = 0; i < sendcmd->nb_intervals; i++) {
439431 Interval *interval = &sendcmd->intervals[i];
440432 for (j = 0; j < interval->nb_commands; j++) {
@@ -520,7 +512,7 @@ AVFILTER_DEFINE_CLASS(sendcmd); · 79 unmodified lines
520512
521513 static av_cold int sendcmd_init(AVFilterContext *ctx, const char *args)
522514 {
523− return init(ctx, args, &sendcmd_class);
515+ return init(ctx);
524516 }
525517
526518 static const AVFilterPad sendcmd_inputs[] = {
@@ -562,7 +554,7 @@ AVFILTER_DEFINE_CLASS(asendcmd); · 35 unmodified lines
562554
563555 static av_cold int asendcmd_init(AVFilterContext *ctx, const char *args)
564556 {
565− return init(ctx, args, &asendcmd_class);
557+ return init(ctx);
566558 }
567559
568560 static const AVFilterPad asendcmd_inputs[] = {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t