[FFmpeg-cvslog] lavfi: always build vsrc_buffer.

Anton Khirnov git at videolan.org
Fri Dec 23 03:37:59 CET 2011


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Wed Dec 21 20:47:52 2011 +0100| [196c9e5c8c1706e81217e372ea6a3a101486af9e] | committer: Anton Khirnov

lavfi: always build vsrc_buffer.

It's a part of public API.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=196c9e5c8c1706e81217e372ea6a3a101486af9e
---

 configure                |    2 --
 libavfilter/Makefile     |    2 +-
 libavfilter/allfilters.c |    7 ++++++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index 1c7fb3b..8e2e08b 100755
--- a/configure
+++ b/configure
@@ -1525,14 +1525,12 @@ postproc_deps="gpl"
 
 # programs
 avconv_deps="avcodec avformat swscale"
-avconv_select="buffer_filter"
 avplay_deps="avcodec avformat swscale sdl"
 avplay_select="rdft"
 avprobe_deps="avcodec avformat"
 avserver_deps="avformat ffm_muxer fork rtp_protocol rtsp_demuxer"
 avserver_extralibs='$ldl'
 ffmpeg_deps="avcodec avformat swscale"
-ffmpeg_select="buffer_filter"
 
 doc_deps="texi2html"
 
diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index 63974d0..c269db5 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -12,6 +12,7 @@ OBJS = allfilters.o                                                     \
        drawutils.o                                                      \
        formats.o                                                        \
        graphparser.o                                                    \
+       vsrc_buffer.o
 
 OBJS-$(CONFIG_ANULL_FILTER)                  += af_anull.o
 
@@ -59,7 +60,6 @@ OBJS-$(CONFIG_UNSHARP_FILTER)                += vf_unsharp.o
 OBJS-$(CONFIG_VFLIP_FILTER)                  += vf_vflip.o
 OBJS-$(CONFIG_YADIF_FILTER)                  += vf_yadif.o
 
-OBJS-$(CONFIG_BUFFER_FILTER)                 += vsrc_buffer.o
 OBJS-$(CONFIG_COLOR_FILTER)                  += vsrc_color.o
 OBJS-$(CONFIG_FREI0R_SRC_FILTER)             += vf_frei0r.o
 OBJS-$(CONFIG_MOVIE_FILTER)                  += vsrc_movie.o
diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c
index d729874..a6f1731 100644
--- a/libavfilter/allfilters.c
+++ b/libavfilter/allfilters.c
@@ -80,7 +80,6 @@ void avfilter_register_all(void)
     REGISTER_FILTER (VFLIP,       vflip,       vf);
     REGISTER_FILTER (YADIF,       yadif,       vf);
 
-    REGISTER_FILTER (BUFFER,      buffer,      vsrc);
     REGISTER_FILTER (COLOR,       color,       vsrc);
     REGISTER_FILTER (FREI0R,      frei0r_src,  vsrc);
     REGISTER_FILTER (MOVIE,       movie,       vsrc);
@@ -89,4 +88,10 @@ void avfilter_register_all(void)
     REGISTER_FILTER (TESTSRC,     testsrc,     vsrc);
 
     REGISTER_FILTER (NULLSINK,    nullsink,    vsink);
+
+    /* vsrc_buffer is a part of public API => registered unconditionally */
+    {
+        extern avfilter_vsrc_buffer;
+        avfilter_register(&avfilter_vsrc_buffer);
+    }
 }



More information about the ffmpeg-cvslog mailing list