[FFmpeg-cvslog] lavfi: always enable the scale filter and depend on sws.
Anton Khirnov
git at videolan.org
Sun May 6 22:19:00 CEST 2012
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sat May 5 10:22:55 2012 +0200| [25b3babe111a37697d98890400f5864f560ae167] | committer: Anton Khirnov
lavfi: always enable the scale filter and depend on sws.
The scale filter is used for internal colorspace conversions, so it must
always be present.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=25b3babe111a37697d98890400f5864f560ae167
---
configure | 2 +-
libavfilter/Makefile | 5 ++---
libavfilter/allfilters.c | 8 ++++++--
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/configure b/configure
index b571a94..837e296 100755
--- a/configure
+++ b/configure
@@ -1530,11 +1530,11 @@ frei0r_src_filter_deps="frei0r dlopen strtok_r"
frei0r_src_filter_extralibs='$ldl'
hqdn3d_filter_deps="gpl"
ocv_filter_deps="libopencv"
-scale_filter_deps="swscale"
yadif_filter_deps="gpl"
# libraries
avdevice_deps="avcodec avformat"
+avfilter_deps="swscale"
avformat_deps="avcodec"
# programs
diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index 6ee94e9..46fa93d 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -1,7 +1,6 @@
NAME = avfilter
-FFLIBS = avutil
+FFLIBS = avutil swscale
FFLIBS-$(CONFIG_MOVIE_FILTER) += avformat avcodec
-FFLIBS-$(CONFIG_SCALE_FILTER) += swscale
HEADERS = avfilter.h avfiltergraph.h buffersrc.h version.h vsrc_buffer.h
@@ -12,6 +11,7 @@ OBJS = allfilters.o \
drawutils.o \
formats.o \
graphparser.o \
+ vf_scale.o \
vsrc_buffer.o
OBJS-$(CONFIG_ANULL_FILTER) += af_anull.o
@@ -46,7 +46,6 @@ OBJS-$(CONFIG_OCV_FILTER) += vf_libopencv.o
OBJS-$(CONFIG_OVERLAY_FILTER) += vf_overlay.o
OBJS-$(CONFIG_PAD_FILTER) += vf_pad.o
OBJS-$(CONFIG_PIXDESCTEST_FILTER) += vf_pixdesctest.o
-OBJS-$(CONFIG_SCALE_FILTER) += vf_scale.o
OBJS-$(CONFIG_SELECT_FILTER) += vf_select.o
OBJS-$(CONFIG_SETDAR_FILTER) += vf_aspect.o
OBJS-$(CONFIG_SETPTS_FILTER) += vf_setpts.o
diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c
index ba66941..198e152 100644
--- a/libavfilter/allfilters.c
+++ b/libavfilter/allfilters.c
@@ -66,7 +66,6 @@ void avfilter_register_all(void)
REGISTER_FILTER (OVERLAY, overlay, vf);
REGISTER_FILTER (PAD, pad, vf);
REGISTER_FILTER (PIXDESCTEST, pixdesctest, vf);
- REGISTER_FILTER (SCALE, scale, vf);
REGISTER_FILTER (SELECT, select, vf);
REGISTER_FILTER (SETDAR, setdar, vf);
REGISTER_FILTER (SETPTS, setpts, vf);
@@ -89,9 +88,14 @@ void avfilter_register_all(void)
REGISTER_FILTER (NULLSINK, nullsink, vsink);
- /* vsrc_buffer is a part of public API => registered unconditionally */
+ /* those filters are part of public or internal API => registered
+ * unconditionally */
{
extern AVFilter avfilter_vsrc_buffer;
avfilter_register(&avfilter_vsrc_buffer);
}
+ {
+ extern AVFilter avfilter_vf_scale;
+ avfilter_register(&avfilter_vf_scale);
+ }
}
More information about the ffmpeg-cvslog
mailing list