Browse Source

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

tags/n2.0
Clément Bœsch 13 years ago
parent
commit
7eb1ea2ae6
2 changed files with 3 additions and 13 deletions
  1. +0
    -2
      libavfilter/avfilter.c
  2. +3
    -11
      libavfilter/f_sendcmd.c

+ 0
- 2
libavfilter/avfilter.c View File

@@ -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",
};


+ 3
- 11
libavfilter/f_sendcmd.c View File

@@ -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[] = {


Loading…
Cancel
Save