Browse Source

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

tags/n2.0
Clément Bœsch 12 years ago
parent
commit
1c0feee059
3 changed files with 4 additions and 14 deletions
  1. +4
    -7
      doc/filters.texi
  2. +0
    -6
      libavfilter/asrc_anullsrc.c
  3. +0
    -1
      libavfilter/avfilter.c

+ 4
- 7
doc/filters.texi View File

@@ -1596,16 +1596,10 @@ as a template and to be employed in analysis / debugging tools, or as
the source for filters which ignore the input data (for example the sox the source for filters which ignore the input data (for example the sox
synth filter). synth filter).


It accepts an optional sequence of @var{key}=@var{value} pairs,
separated by ":".

The description of the accepted options follows.
This source accepts the following options:


@table @option @table @option


@item sample_rate, s
Specify the sample rate, and defaults to 44100.

@item channel_layout, cl @item channel_layout, cl


Specify the channel layout, and can be either an integer or a string Specify the channel layout, and can be either an integer or a string
@@ -1616,6 +1610,9 @@ Check the channel_layout_map definition in
@file{libavutil/channel_layout.c} for the mapping between strings and @file{libavutil/channel_layout.c} for the mapping between strings and
channel layout values. channel layout values.


@item sample_rate, r
Specify the sample rate, and defaults to 44100.

@item nb_samples, n @item nb_samples, n
Set the number of samples per requested frames. Set the number of samples per requested frames.




+ 0
- 6
libavfilter/asrc_anullsrc.c View File

@@ -64,12 +64,6 @@ static int init(AVFilterContext *ctx, const char *args)
ANullContext *null = ctx->priv; ANullContext *null = ctx->priv;
int ret; int ret;


null->class = &anullsrc_class;
av_opt_set_defaults(null);

if ((ret = av_set_options_string(null, args, "=", ":")) < 0)
return ret;

if ((ret = ff_parse_sample_rate(&null->sample_rate, if ((ret = ff_parse_sample_rate(&null->sample_rate,
null->sample_rate_str, ctx)) < 0) null->sample_rate_str, ctx)) < 0)
return ret; return ret;


+ 0
- 1
libavfilter/avfilter.c View File

@@ -676,7 +676,6 @@ static const char *const filters_left_to_update[] = {
"aconvert", "aconvert",
"aevalsrc", "aevalsrc",
"amerge", "amerge",
"anullsrc",
"aresample", "aresample",
"asetnsamples", "asetnsamples",
"atempo", "atempo",


Loading…
Cancel
Save