virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-02 20:35:37 +02:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
Clément Bœsch 2013-04-11 18:28:13 +02:00
parent eabc0c733d
commit c74b0eda34
3 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/filters.texi
View File

@ -759,7 +759,7 @@ aformat=sample_fmts=u8|s16:channel_layouts=stereo
Merge two or more audio streams into a single multi-channel stream. Merge two or more audio streams into a single multi-channel stream.
The filter accepts the following named options: The filter accepts the following options:
@table @option @table @option

9
libavfilter/af_amerge.c
View File

@ -306,15 +306,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *insamples)
static av_cold int init(AVFilterContext *ctx, const char *args) static av_cold int init(AVFilterContext *ctx, const char *args)
{ {
AMergeContext *am = ctx->priv; AMergeContext *am = ctx->priv;
int ret, i; int i;
am->class = &amerge_class;
av_opt_set_defaults(am);
ret = av_set_options_string(am, args, "=", ":");
if (ret < 0) {
av_log(ctx, AV_LOG_ERROR, "Error parsing options: '%s'\n", args);
return ret;
}
am->in = av_calloc(am->nb_inputs, sizeof(*am->in)); am->in = av_calloc(am->nb_inputs, sizeof(*am->in));
if (!am->in) if (!am->in)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);

1
libavfilter/avfilter.c
View File

@ -674,7 +674,6 @@ static int process_options(AVFilterContext *ctx, AVDictionary **options,
static const char *const filters_left_to_update[] = { static const char *const filters_left_to_update[] = {
"abuffer", "abuffer",
"aconvert", "aconvert",
"amerge",
"aresample", "aresample",
"atempo", "atempo",
"buffer", "buffer",