virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
Code Issues Releases Activity

Merge commit 'b7b3302f8f2c7d9f6e08e0a976890eefe3edcc9e'

Browse Source 
* commit 'b7b3302f8f2c7d9f6e08e0a976890eefe3edcc9e':
  vsrc_nullsrc: switch to an AVOptions-based system.

Conflicts:
	libavfilter/vsrc_nullsrc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-04-11 03:20:43 +02:00
commit 670e0f7f66
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavfilter/avfilter.c
View File

@ -714,6 +714,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque
!strcmp(filter->filter->name, "mptestsrc" ) ||
!strcmp(filter->filter->name, "negate" ) ||
!strcmp(filter->filter->name, "noise" ) ||
!strcmp(filter->filter->name, "nullsrc" ) ||
!strcmp(filter->filter->name, "overlay" ) ||
!strcmp(filter->filter->name, "pad" ) ||
!strcmp(filter->filter->name, "format") ||

8
libavfilter/vsrc_testsrc.c
View File

@ -95,11 +95,11 @@ static const AVOption color_options[] = {
};
static const AVOption options[] = {
COMMON_OPTIONS
/* only used by testsrc */
{ "decimals", "set number of decimals to show", OFFSET(nb_decimals), AV_OPT_TYPE_INT, {.i64=0}, 0, 17, FLAGS },
{ "n", "set number of decimals to show", OFFSET(nb_decimals), AV_OPT_TYPE_INT, {.i64=0}, 0, 17, FLAGS },
COMMON_OPTIONS
{ NULL },
};
@ -290,10 +290,8 @@ static av_cold int nullsrc_init(AVFilterContext *ctx, const char *args)
{
TestSourceContext *test = ctx->priv;
test->class = &nullsrc_class;
test->fill_picture_fn = nullsrc_fill_picture;
av_opt_set_defaults(test);
return init(ctx, args);
return init(ctx, NULL);
}
static const AVFilterPad nullsrc_outputs[] = {
@ -312,9 +310,9 @@ AVFilter avfilter_vsrc_nullsrc = {
.init = nullsrc_init,
.uninit = uninit,
.priv_size = sizeof(TestSourceContext),
.priv_class = &nullsrc_class,
.inputs = NULL,
.outputs = nullsrc_outputs,
.priv_class = &nullsrc_class,
};
#endif /* CONFIG_NULLSRC_FILTER */