[FFmpeg-devel] [PATCH 1/4] lavfi/buffersink: rename filter structures.

[Nicolas George]

Reduce the diff with the fork.

Signed-off-by: Nicolas George <nicolas.george at normalesup.org>
---
 libavfilter/allfilters.c |    8 ++------
 libavfilter/buffersink.c |   12 ++++++------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c
index f9e5d50..f83cdc4 100644
--- a/libavfilter/allfilters.c
+++ b/libavfilter/allfilters.c
@@ -185,17 +185,13 @@ void avfilter_register_all(void)
 
     REGISTER_FILTER_UNCONDITIONAL(vsink_ffbuffersink);
     REGISTER_FILTER_UNCONDITIONAL(asink_ffabuffersink);
-#if !AV_HAVE_INCOMPATIBLE_FORK_ABI
-    REGISTER_FILTER_UNCONDITIONAL(vsink_buffersink);
-    REGISTER_FILTER_UNCONDITIONAL(asink_abuffersink);
-#endif
 
     /* those filters are part of public or internal API => registered
      * unconditionally */
     REGISTER_FILTER_UNCONDITIONAL(asrc_abuffer);
     REGISTER_FILTER_UNCONDITIONAL(vsrc_buffer);
-    //REGISTER_FILTER_UNCONDITIONAL(asink_abuffer);
-    //REGISTER_FILTER_UNCONDITIONAL(vsink_buffer);
+    REGISTER_FILTER_UNCONDITIONAL(asink_abuffer);
+    REGISTER_FILTER_UNCONDITIONAL(vsink_buffer);
     REGISTER_FILTER_UNCONDITIONAL(af_afifo);
     REGISTER_FILTER_UNCONDITIONAL(vf_fifo);
 }
diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c
index a3e3095..4b9918e 100644
--- a/libavfilter/buffersink.c
+++ b/libavfilter/buffersink.c
@@ -512,7 +512,7 @@ AVFilter avfilter_asink_ffabuffersink = {
     .outputs       = NULL,
 };
 
-static const AVFilterPad buffersink_inputs[] = {
+static const AVFilterPad avfilter_vsink_buffer_inputs[] = {
     {
         .name        = "default",
         .type        = AVMEDIA_TYPE_VIDEO,
@@ -521,7 +521,7 @@ static const AVFilterPad buffersink_inputs[] = {
     { NULL }
 };
 
-AVFilter avfilter_vsink_buffersink = {
+AVFilter avfilter_vsink_buffer = {
     .name      = "buffersink",
     .description = NULL_IF_CONFIG_SMALL("Buffer video frames, and make them available to the end of the filter graph."),
     .priv_size = sizeof(BufferSinkContext),
@@ -529,11 +529,11 @@ AVFilter avfilter_vsink_buffersink = {
     .uninit    = uninit,
 
     .query_formats = vsink_query_formats,
-    .inputs    = buffersink_inputs,
+    .inputs    = avfilter_vsink_buffer_inputs,
     .outputs   = NULL,
 };
 
-static const AVFilterPad abuffersink_inputs[] = {
+static const AVFilterPad avfilter_asink_abuffer_inputs[] = {
     {
         .name           = "default",
         .type           = AVMEDIA_TYPE_AUDIO,
@@ -542,7 +542,7 @@ static const AVFilterPad abuffersink_inputs[] = {
     { NULL }
 };
 
-AVFilter avfilter_asink_abuffersink = {
+AVFilter avfilter_asink_abuffer = {
     .name      = "abuffersink",
     .description = NULL_IF_CONFIG_SMALL("Buffer audio frames, and make them available to the end of the filter graph."),
     .priv_size = sizeof(BufferSinkContext),
@@ -550,6 +550,6 @@ AVFilter avfilter_asink_abuffersink = {
     .uninit    = uninit,
 
     .query_formats = asink_query_formats,
-    .inputs    = abuffersink_inputs,
+    .inputs    = avfilter_asink_abuffer_inputs,
     .outputs   = NULL,
 };
-- 
1.7.10.4