diff options
| author | wm4 <wm4@nowhere> | 2016-02-05 23:17:33 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2016-02-05 23:17:33 +0100 |
| commit | 45345d9c41f1491e9809153dc3b3950fba560d89 (patch) | |
| tree | 161cb87edb5890e99479f5691179376cba68b563 /common | |
| parent | 8af70561a419c5a4a9926f9e60381dc4282a3fd9 (diff) | |
| download | mpv-45345d9c41f1491e9809153dc3b3950fba560d89.tar.bz2 mpv-45345d9c41f1491e9809153dc3b3950fba560d89.tar.xz | |
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.
Diffstat (limited to 'common')
| -rw-r--r-- | common/av_log.c | 11 |
1 files changed, 2 insertions, 9 deletions
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 <libavcodec/avcodec.h> #include <libavformat/avformat.h> #include <libswscale/swscale.h> +#include <libavfilter/avfilter.h> #if HAVE_LIBAVDEVICE #include <libavdevice/avdevice.h> #endif -#if HAVE_LIBAVFILTER -#include <libavfilter/avfilter.h> -#endif - #if HAVE_LIBAVRESAMPLE #include <libavresample/avresample.h> #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 |