History

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

Clément Bœsch committed 13 years ago

Commit e2e992c1 parent 1c0feee3 files · +6 −15Browse files

Unified · Split

3 files
  1. doc/filters.texi +1 −2
  2. libavfilter/af_asetnsamples.c +5 −12
  3. libavfilter/avfilter.c +0 −1
doc/filters.texi+1−2
@@ -902,8 +902,7 @@ The last output packet may contain a different number of samples, as · 901 unmodified lines
902902 the filter will flush all the remaining samples when the input audio
903903 signal its end.
904904
905−The filter accepts parameters as a list of @var{key}=@var{value} pairs,
906−separated by ":".
905+The filter accepts the following options:
907906
908907 @table @option
909908
libavfilter/af_asetnsamples.c+5−12
@@ -45,11 +45,11 @@ typedef struct { · 44 unmodified lines
4545 #define FLAGS AV_OPT_FLAG_AUDIO_PARAM|AV_OPT_FLAG_FILTERING_PARAM
4646
4747 static const AVOption asetnsamples_options[] = {
48−{ "pad", "pad last frame with zeros", OFFSET(pad), AV_OPT_TYPE_INT, {.i64=1}, 0, 1, FLAGS },
49−{ "p", "pad last frame with zeros", OFFSET(pad), AV_OPT_TYPE_INT, {.i64=1}, 0, 1, FLAGS },
50−{ "nb_out_samples", "set the number of per-frame output samples", OFFSET(nb_out_samples), AV_OPT_TYPE_INT, {.i64=1024}, 1, INT_MAX, FLAGS },
51−{ "n", "set the number of per-frame output samples", OFFSET(nb_out_samples), AV_OPT_TYPE_INT, {.i64=1024}, 1, INT_MAX, FLAGS },
52−{ NULL }
48+ { "nb_out_samples", "set the number of per-frame output samples", OFFSET(nb_out_samples), AV_OPT_TYPE_INT, {.i64=1024}, 1, INT_MAX, FLAGS },
49+ { "n", "set the number of per-frame output samples", OFFSET(nb_out_samples), AV_OPT_TYPE_INT, {.i64=1024}, 1, INT_MAX, FLAGS },
50+ { "pad", "pad last frame with zeros", OFFSET(pad), AV_OPT_TYPE_INT, {.i64=1}, 0, 1, FLAGS },
51+ { "p", "pad last frame with zeros", OFFSET(pad), AV_OPT_TYPE_INT, {.i64=1}, 0, 1, FLAGS },
52+ { NULL }
5353 };
5454
5555 AVFILTER_DEFINE_CLASS(asetnsamples);
@@ -57,13 +57,6 @@ AVFILTER_DEFINE_CLASS(asetnsamples); · 1 unmodified line
5757 static av_cold int init(AVFilterContext *ctx, const char *args)
5858 {
5959 ASNSContext *asns = ctx->priv;
60− int err;
61−
62− asns->class = &asetnsamples_class;
63− av_opt_set_defaults(asns);
64−
65− if ((err = av_set_options_string(asns, args, "=", ":")) < 0)
66− return err;
6760
6861 asns->next_out_pts = AV_NOPTS_VALUE;
6962 av_log(ctx, AV_LOG_VERBOSE, "nb_out_samples:%d pad:%d\n", asns->nb_out_samples, asns->pad);
libavfilter/avfilter.c+0−1
@@ -677,7 +677,6 @@ static const char *const filters_left_to_update[] = { · 676 unmodified lines
677677 "aevalsrc",
678678 "amerge",
679679 "aresample",
680− "asetnsamples",
681680 "atempo",
682681 "buffer",
683682 "flite",

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