diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-29 11:50:56 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-29 11:58:11 +0100 |
commit | 325f6e0a97c943807c665eb1d5c278f8d789156b (patch) | |
tree | 4502d77d338015bfffe11a71ee8e80fd9bf98391 /libavfilter/vsrc_testsrc.c | |
parent | d3e13250a0308d8fda851e064ddbbbd7e574d880 (diff) | |
parent | cd43ca0443a298ab8cf9f9567c568f83b67b656c (diff) | |
download | ffmpeg-streaming-325f6e0a97c943807c665eb1d5c278f8d789156b.zip ffmpeg-streaming-325f6e0a97c943807c665eb1d5c278f8d789156b.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavfi: do not export the filters from shared objects
Conflicts:
libavfilter/af_amix.c
libavfilter/af_anull.c
libavfilter/asrc_anullsrc.c
libavfilter/f_select.c
libavfilter/f_settb.c
libavfilter/split.c
libavfilter/src_movie.c
libavfilter/vf_aspect.c
libavfilter/vf_blackframe.c
libavfilter/vf_colorbalance.c
libavfilter/vf_copy.c
libavfilter/vf_crop.c
libavfilter/vf_cropdetect.c
libavfilter/vf_drawbox.c
libavfilter/vf_format.c
libavfilter/vf_framestep.c
libavfilter/vf_frei0r.c
libavfilter/vf_hflip.c
libavfilter/vf_libopencv.c
libavfilter/vf_lut.c
libavfilter/vf_null.c
libavfilter/vf_overlay.c
libavfilter/vf_scale.c
libavfilter/vf_transpose.c
libavfilter/vf_unsharp.c
libavfilter/vf_vflip.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vsrc_testsrc.c')
-rw-r--r-- | libavfilter/vsrc_testsrc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavfilter/vsrc_testsrc.c b/libavfilter/vsrc_testsrc.c index 1e7f8ca..0ad1474 100644 --- a/libavfilter/vsrc_testsrc.c +++ b/libavfilter/vsrc_testsrc.c @@ -258,7 +258,7 @@ static const AVFilterPad color_outputs[] = { { NULL } }; -AVFilter avfilter_vsrc_color = { +AVFilter ff_vsrc_color = { .name = "color", .description = NULL_IF_CONFIG_SMALL("Provide an uniformly colored input."), .priv_class = &color_class, @@ -389,7 +389,7 @@ static const AVFilterPad haldclutsrc_outputs[] = { { NULL } }; -AVFilter avfilter_vsrc_haldclutsrc = { +AVFilter ff_vsrc_haldclutsrc = { .name = "haldclutsrc", .description = NULL_IF_CONFIG_SMALL("Provide an identity Hald CLUT."), .priv_class = &haldclutsrc_class, @@ -427,7 +427,7 @@ static const AVFilterPad nullsrc_outputs[] = { { NULL }, }; -AVFilter avfilter_vsrc_nullsrc = { +AVFilter ff_vsrc_nullsrc = { .name = "nullsrc", .description = NULL_IF_CONFIG_SMALL("Null video source, return unprocessed video frames."), .init = nullsrc_init, @@ -660,7 +660,7 @@ static const AVFilterPad avfilter_vsrc_testsrc_outputs[] = { { NULL } }; -AVFilter avfilter_vsrc_testsrc = { +AVFilter ff_vsrc_testsrc = { .name = "testsrc", .description = NULL_IF_CONFIG_SMALL("Generate test pattern."), .priv_size = sizeof(TestSourceContext), @@ -776,7 +776,7 @@ static const AVFilterPad avfilter_vsrc_rgbtestsrc_outputs[] = { { NULL } }; -AVFilter avfilter_vsrc_rgbtestsrc = { +AVFilter ff_vsrc_rgbtestsrc = { .name = "rgbtestsrc", .description = NULL_IF_CONFIG_SMALL("Generate RGB test pattern."), .priv_size = sizeof(TestSourceContext), @@ -950,7 +950,7 @@ static av_cold int smptebars_init(AVFilterContext *ctx) return init(ctx); } -AVFilter avfilter_vsrc_smptebars = { +AVFilter ff_vsrc_smptebars = { .name = "smptebars", .description = NULL_IF_CONFIG_SMALL("Generate SMPTE color bars."), .priv_size = sizeof(TestSourceContext), @@ -1055,7 +1055,7 @@ static av_cold int smptehdbars_init(AVFilterContext *ctx) return init(ctx); } -AVFilter avfilter_vsrc_smptehdbars = { +AVFilter ff_vsrc_smptehdbars = { .name = "smptehdbars", .description = NULL_IF_CONFIG_SMALL("Generate SMPTE HD color bars."), .priv_size = sizeof(TestSourceContext), |