The scale filter is used for internal colorspace conversions, so it must always be present. --- configure | 2 +- libavfilter/Makefile | 7 +++---- libavfilter/allfilters.c | 8 ++++++-- 3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/configure b/configure index b571a94..f2b0bc3 100755 --- a/configure +++ b/configure @@ -1530,12 +1530,12 @@ 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" avformat_deps="avcodec" +avfilter_deps="swscale" # programs avconv_deps="avcodec avfilter avformat avresample swscale" diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 6ee94e9..725c0b6 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,7 +11,8 @@ OBJS = allfilters.o \ drawutils.o \ formats.o \ graphparser.o \ - vsrc_buffer.o + vsrc_buffer.o \ + vf_scale.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); + } } -- 1.7.9.5 _______________________________________________ libav-devel mailing list libav-devel@libav.org https://lists.libav.org/mailman/listinfo/libav-devel