History

Merge commit '7b3eb745b98b04dd8a4970b9fd6c98998e858fc1'

* commit '7b3eb745b98b04dd8a4970b9fd6c98998e858fc1': vsrc_testsrc: switch to an AVOptions-based system. Conflicts: doc/filters.texi libavfilter/vsrc_testsrc.c

Michael Niedermayer committed 13 years ago

Commit ef29a952 parents db2de94 7b3eb743 files · +19 −22Browse files

Unified · Split

3 files
  1. doc/filters.texi +1 −2
  2. libavfilter/avfilter.c +2 −0
  3. libavfilter/vsrc_testsrc.c +16 −20
doc/filters.texi+1−2
@@ -6201,8 +6201,7 @@ The @code{testsrc} source generates a test video pattern, showing a · 6200 unmodified lines
6201color pattern, a scrolling gradient and a timestamp. This is mainly6201color pattern, a scrolling gradient and a timestamp. This is mainly
6202intended for testing purposes.6202intended for testing purposes.
6203 6203
6204These sources accept an optional sequence of @var{key}=@var{value} pairs,6204The sources accept the following options:
6205separated by ":". The description of the accepted options follows.
6206 6205
6207@table @option6206@table @option
6208 6207
libavfilter/avfilter.c+2−0
@@ -725,6 +725,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque · 724 unmodified lines
725 !strcmp(filter->filter->name, "pp" ) ||725 !strcmp(filter->filter->name, "pp" ) ||
726 !strcmp(filter->filter->name, "aperms") ||726 !strcmp(filter->filter->name, "aperms") ||
727 !strcmp(filter->filter->name, "resample") ||727 !strcmp(filter->filter->name, "resample") ||
728 !strcmp(filter->filter->name, "rgbtestsrc") ||
728 !strcmp(filter->filter->name, "setpts" ) ||729 !strcmp(filter->filter->name, "setpts" ) ||
729 !strcmp(filter->filter->name, "settb" ) ||730 !strcmp(filter->filter->name, "settb" ) ||
730 !strcmp(filter->filter->name, "showspectrum") ||731 !strcmp(filter->filter->name, "showspectrum") ||
@@ -733,6 +734,7 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque · 2 unmodified lines
733 !strcmp(filter->filter->name, "split" ) ||734 !strcmp(filter->filter->name, "split" ) ||
734 !strcmp(filter->filter->name, "stereo3d" ) ||735 !strcmp(filter->filter->name, "stereo3d" ) ||
735 !strcmp(filter->filter->name, "subtitles") ||736 !strcmp(filter->filter->name, "subtitles") ||
737 !strcmp(filter->filter->name, "testsrc" ) ||
736 !strcmp(filter->filter->name, "thumbnail") ||738 !strcmp(filter->filter->name, "thumbnail") ||
737 !strcmp(filter->filter->name, "transpose") ||739 !strcmp(filter->filter->name, "transpose") ||
738 !strcmp(filter->filter->name, "treble" ) ||740 !strcmp(filter->filter->name, "treble" ) ||
libavfilter/vsrc_testsrc.c+16−20
@@ -508,10 +508,8 @@ static av_cold int test_init(AVFilterContext *ctx, const char *args) · 507 unmodified lines
508{508{
509 TestSourceContext *test = ctx->priv;509 TestSourceContext *test = ctx->priv;
510 510
511 test->class = &testsrc_class;
512 test->fill_picture_fn = test_fill_picture;511 test->fill_picture_fn = test_fill_picture;
513 av_opt_set_defaults(test);512 return init(ctx, NULL);
514 return init(ctx, args);
515}513}
516 514
517static int test_query_formats(AVFilterContext *ctx)515static int test_query_formats(AVFilterContext *ctx)
@@ -534,17 +532,17 @@ static const AVFilterPad avfilter_vsrc_testsrc_outputs[] = { · 16 unmodified lines
534};532};
535 533
536AVFilter avfilter_vsrc_testsrc = {534AVFilter avfilter_vsrc_testsrc = {
537 .name = "testsrc",535 .name = "testsrc",
538 .description = NULL_IF_CONFIG_SMALL("Generate test pattern."),536 .description = NULL_IF_CONFIG_SMALL("Generate test pattern."),
539 .priv_size = sizeof(TestSourceContext),537 .priv_size = sizeof(TestSourceContext),
540 .init = test_init,538 .priv_class = &testsrc_class,
541 .uninit = uninit,539 .init = test_init,
540 .uninit = uninit,
542 541
543 .query_formats = test_query_formats,542 .query_formats = test_query_formats,
544 543
545 .inputs = NULL,544 .inputs = NULL,
546 .outputs = avfilter_vsrc_testsrc_outputs,545 .outputs = avfilter_vsrc_testsrc_outputs,
547 .priv_class = &testsrc_class,
548};546};
549 547
550#endif /* CONFIG_TESTSRC_FILTER */548#endif /* CONFIG_TESTSRC_FILTER */
@@ -615,10 +613,8 @@ static av_cold int rgbtest_init(AVFilterContext *ctx, const char *args) · 64 unmodified lines
615 TestSourceContext *test = ctx->priv;613 TestSourceContext *test = ctx->priv;
616 614
617 test->draw_once = 1;615 test->draw_once = 1;
618 test->class = &rgbtestsrc_class;
619 test->fill_picture_fn = rgbtest_fill_picture;616 test->fill_picture_fn = rgbtest_fill_picture;
620 av_opt_set_defaults(test);617 return init(ctx, NULL);
621 return init(ctx, args);
622}618}
623 619
624static int rgbtest_query_formats(AVFilterContext *ctx)620static int rgbtest_query_formats(AVFilterContext *ctx)
@@ -654,18 +650,18 @@ static const AVFilterPad avfilter_vsrc_rgbtestsrc_outputs[] = { · 29 unmodified lines
654};650};
655 651
656AVFilter avfilter_vsrc_rgbtestsrc = {652AVFilter avfilter_vsrc_rgbtestsrc = {
657 .name = "rgbtestsrc",653 .name = "rgbtestsrc",
658 .description = NULL_IF_CONFIG_SMALL("Generate RGB test pattern."),654 .description = NULL_IF_CONFIG_SMALL("Generate RGB test pattern."),
659 .priv_size = sizeof(TestSourceContext),655 .priv_size = sizeof(TestSourceContext),
660 .init = rgbtest_init,656 .priv_class = &rgbtestsrc_class,
661 .uninit = uninit,657 .init = rgbtest_init,
658 .uninit = uninit,
662 659
663 .query_formats = rgbtest_query_formats,660 .query_formats = rgbtest_query_formats,
664 661
665 .inputs = NULL,662 .inputs = NULL,
666 663
667 .outputs = avfilter_vsrc_rgbtestsrc_outputs,664 .outputs = avfilter_vsrc_rgbtestsrc_outputs,
668 .priv_class = &rgbtestsrc_class,
669};665};
670 666
671#endif /* CONFIG_RGBTESTSRC_FILTER */667#endif /* CONFIG_RGBTESTSRC_FILTER */

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