diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-05-05 10:22:55 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-05-06 16:22:29 +0200 |
| commit | 25b3babe111a37697d98890400f5864f560ae167 (patch) | |
| tree | 413c6a3b9f7adbdd9aca575c9189155784cb4443 | |
| parent | fd18ee0ff659fc73e56bd43f5b93ed82934c6c7f (diff) | |
| download | ffmpeg-25b3babe111a37697d98890400f5864f560ae167.tar.gz | |
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.
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | libavfilter/Makefile | 5 | ||||
| -rw-r--r-- | libavfilter/allfilters.c | 8 |
3 files changed, 9 insertions, 6 deletions
@@ -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 6ee94e9a1b..46fa93dc4f 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 ba66941002..198e152cb0 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); + } } |