From 45345d9c41f1491e9809153dc3b3950fba560d89 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 5 Feb 2016 23:17:33 +0100 Subject: build: make libavfilter mandatory The complex filter support that will be added makes much more complex use of libavfilter, and I'm not going to bother with adding hacks to keep libavfilter optional. --- audio/filter/af.c | 2 -- common/av_log.c | 11 ++--------- video/filter/vf.c | 2 -- wscript | 3 ++- wscript_build.py | 16 ++++++++-------- 5 files changed, 12 insertions(+), 22 deletions(-) diff --git a/audio/filter/af.c b/audio/filter/af.c index 18019d8930..ac1b4926d8 100644 --- a/audio/filter/af.c +++ b/audio/filter/af.c @@ -59,9 +59,7 @@ static const struct af_info *const filter_list[] = { &af_info_rubberband, #endif &af_info_scaletempo, -#if HAVE_LIBAVFILTER &af_info_lavfi, -#endif NULL }; diff --git a/common/av_log.c b/common/av_log.c index 05542cd15a..7e0b271c81 100644 --- a/common/av_log.c +++ b/common/av_log.c @@ -36,15 +36,12 @@ #include #include #include +#include #if HAVE_LIBAVDEVICE #include #endif -#if HAVE_LIBAVFILTER -#include -#endif - #if HAVE_LIBAVRESAMPLE #include #endif @@ -161,10 +158,8 @@ void init_libav(struct mpv_global *global) avcodec_register_all(); av_register_all(); avformat_network_init(); - -#if HAVE_LIBAVFILTER avfilter_register_all(); -#endif + #if HAVE_LIBAVDEVICE avdevice_register_all(); #endif @@ -196,9 +191,7 @@ void print_libav_versions(struct mp_log *log, int v) {"libavcodec", LIBAVCODEC_VERSION_INT, avcodec_version()}, {"libavformat", LIBAVFORMAT_VERSION_INT, avformat_version()}, {"libswscale", LIBSWSCALE_VERSION_INT, swscale_version()}, -#if HAVE_LIBAVFILTER {"libavfilter", LIBAVFILTER_VERSION_INT, avfilter_version()}, -#endif #if HAVE_LIBAVRESAMPLE {"libavresample", LIBAVRESAMPLE_VERSION_INT, avresample_version()}, #endif diff --git a/video/filter/vf.c b/video/filter/vf.c index f710d81ea7..d8e7f6b4c8 100644 --- a/video/filter/vf.c +++ b/video/filter/vf.c @@ -71,7 +71,6 @@ static const vf_info_t *const filter_list[] = { &vf_info_noformat, &vf_info_flip, -#if HAVE_LIBAVFILTER &vf_info_mirror, &vf_info_lavfi, &vf_info_rotate, @@ -79,7 +78,6 @@ static const vf_info_t *const filter_list[] = { &vf_info_pullup, &vf_info_yadif, &vf_info_stereo3d, -#endif &vf_info_eq, &vf_info_dsize, diff --git a/wscript b/wscript index 602ec58b5e..c6f287ffa1 100644 --- a/wscript +++ b/wscript @@ -422,9 +422,10 @@ FFmpeg/Libav libraries. You need at least {0}. Aborting.".format(libav_versions_ 'req': True, 'fmsg': 'No resampler found. Install libavresample or libswresample (FFmpeg).' }, { - 'name': '--libavfilter', + 'name': 'libavfilter', 'desc': 'libavfilter', 'func': check_pkg_config('libavfilter', '>= 5.0.0'), + 'req': True, }, { 'name': '--libavdevice', 'desc': 'libavdevice', diff --git a/wscript_build.py b/wscript_build.py index 08e24f683c..7295384815 100644 --- a/wscript_build.py +++ b/wscript_build.py @@ -120,7 +120,7 @@ def build(ctx): ( "audio/filter/af_equalizer.c" ), ( "audio/filter/af_format.c" ), ( "audio/filter/af_lavcac3enc.c" ), - ( "audio/filter/af_lavfi.c", "libavfilter" ), + ( "audio/filter/af_lavfi.c" ), ( "audio/filter/af_lavrresample.c" ), ( "audio/filter/af_pan.c" ), ( "audio/filter/af_rubberband.c", "rubberband" ), @@ -298,20 +298,20 @@ def build(ctx): ( "video/filter/vf_expand.c" ), ( "video/filter/vf_flip.c" ), ( "video/filter/vf_format.c" ), - ( "video/filter/vf_gradfun.c", "libavfilter"), - ( "video/filter/vf_lavfi.c", "libavfilter"), - ( "video/filter/vf_mirror.c", "libavfilter"), + ( "video/filter/vf_gradfun.c" ), + ( "video/filter/vf_lavfi.c" ), + ( "video/filter/vf_mirror.c" ), ( "video/filter/vf_noformat.c" ), - ( "video/filter/vf_pullup.c", "libavfilter"), - ( "video/filter/vf_rotate.c", "libavfilter"), + ( "video/filter/vf_pullup.c" ), + ( "video/filter/vf_rotate.c" ), ( "video/filter/vf_scale.c" ), - ( "video/filter/vf_stereo3d.c", "libavfilter"), + ( "video/filter/vf_stereo3d.c" ), ( "video/filter/vf_sub.c" ), ( "video/filter/vf_vapoursynth.c", "vapoursynth-core" ), ( "video/filter/vf_vavpp.c", "vaapi"), ( "video/filter/vf_vdpaupp.c", "vdpau" ), ( "video/filter/vf_vdpaurb.c", "vdpau" ), - ( "video/filter/vf_yadif.c", "libavfilter"), + ( "video/filter/vf_yadif.c" ), ( "video/out/aspect.c" ), ( "video/out/bitmap_packer.c" ), ( "video/out/cocoa/video_view.m", "cocoa" ), -- cgit v1.2.3