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
678 "amerge",678 "amerge",
679 "anullsrc",679 "anullsrc",
680 "aresample",680 "aresample",
681 "asendcmd",
682 "asetnsamples",681 "asetnsamples",
683 "astreamsync",682 "astreamsync",
684 "atempo",683 "atempo",
@@ -691,7 +690,6 @@ static const char *const filters_left_to_update[] = { · 6 unmodified lines
691 "pan",690 "pan",
692 "removelogo",691 "removelogo",
693 "scale",692 "scale",
694 "sendcmd",
695 "setdar",693 "setdar",
696 "setsar",694 "setsar",
697};695};
libavfilter/f_sendcmd.c+3−11
@@ -368,17 +368,11 @@ static int cmp_intervals(const void *a, const void *b) · 367 unmodified lines
368 return ret == 0 ? i1->index - i2->index : ret;368 return ret == 0 ? i1->index - i2->index : ret;
369}369}
370 370
371static av_cold int init(AVFilterContext *ctx, const char *args, const AVClass *class)371static av_cold int init(AVFilterContext *ctx)
372{372{
373 SendCmdContext *sendcmd = ctx->priv;373 SendCmdContext *sendcmd = ctx->priv;
374 int ret, i, j;374 int ret, i, j;
375 375
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
382 if (sendcmd->commands_filename && sendcmd->commands_str) {376 if (sendcmd->commands_filename && sendcmd->commands_str) {
383 av_log(ctx, AV_LOG_ERROR,377 av_log(ctx, AV_LOG_ERROR,
384 "Only one of the filename or commands options must be specified\n");378 "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
433 SendCmdContext *sendcmd = ctx->priv;427 SendCmdContext *sendcmd = ctx->priv;
434 int i, j;428 int i, j;
435 429
436 av_opt_free(sendcmd);
437
438 for (i = 0; i < sendcmd->nb_intervals; i++) {430 for (i = 0; i < sendcmd->nb_intervals; i++) {
439 Interval *interval = &sendcmd->intervals[i];431 Interval *interval = &sendcmd->intervals[i];
440 for (j = 0; j < interval->nb_commands; j++) {432 for (j = 0; j < interval->nb_commands; j++) {
@@ -520,7 +512,7 @@ AVFILTER_DEFINE_CLASS(sendcmd); · 79 unmodified lines
520 512
521static av_cold int sendcmd_init(AVFilterContext *ctx, const char *args)513static av_cold int sendcmd_init(AVFilterContext *ctx, const char *args)
522{514{
523 return init(ctx, args, &sendcmd_class);515 return init(ctx);
524}516}
525 517
526static const AVFilterPad sendcmd_inputs[] = {518static const AVFilterPad sendcmd_inputs[] = {
@@ -562,7 +554,7 @@ AVFILTER_DEFINE_CLASS(asendcmd); · 35 unmodified lines
562 554
563static av_cold int asendcmd_init(AVFilterContext *ctx, const char *args)555static av_cold int asendcmd_init(AVFilterContext *ctx, const char *args)
564{556{
565 return init(ctx, args, &asendcmd_class);557 return init(ctx);
566}558}
567 559
568static const AVFilterPad asendcmd_inputs[] = {560static 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