From c14a8c834c0f48e948da688b68f2cd202349adf0 Mon Sep 17 00:00:00 2001
From: Nicolas George <nicolas.george@normalesup.org>
Date: Mon, 11 Mar 2013 21:49:28 +0100
Subject: [PATCH] lavfi/buffersink: schedule removing the "ff" variants.

They are no longer needed since there is no incompatible
ABI version.
---
 libavfilter/allfilters.c | 2 ++
 libavfilter/buffersink.c | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c
index f83cdc4788..51d7996699 100644
--- a/libavfilter/allfilters.c
+++ b/libavfilter/allfilters.c
@@ -183,8 +183,10 @@ void avfilter_register_all(void)
     REGISTER_FILTER(AMOVIE,         amovie,         avsrc);
     REGISTER_FILTER(MOVIE,          movie,          avsrc);
 
+#if FF_API_AVFILTERBUFFER
     REGISTER_FILTER_UNCONDITIONAL(vsink_ffbuffersink);
     REGISTER_FILTER_UNCONDITIONAL(asink_ffabuffersink);
+#endif
 
     /* those filters are part of public or internal API => registered
      * unconditionally */
diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c
index 4b9918edcf..8236f22b76 100644
--- a/libavfilter/buffersink.c
+++ b/libavfilter/buffersink.c
@@ -471,6 +471,7 @@ static int asink_query_formats(AVFilterContext *ctx)
     return 0;
 }
 
+#if FF_API_AVFILTERBUFFER
 static const AVFilterPad ffbuffersink_inputs[] = {
     {
         .name      = "default",
@@ -511,6 +512,7 @@ AVFilter avfilter_asink_ffabuffersink = {
     .inputs        = ffabuffersink_inputs,
     .outputs       = NULL,
 };
+#endif /* FF_API_AVFILTERBUFFER */
 
 static const AVFilterPad avfilter_vsink_buffer_inputs[] = {
     {