summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-04-23 14:11:43 +0200
committerwm4 <wm4@nowhere>2013-04-23 14:11:43 +0200
commit7bb3929a5dbe99631e690104a9af63c17dc3a355 (patch)
tree371f14739db97f27ff2aa2dc90ce818f72e6e0fd /configure
parentc8df1799d93f0dc04158c173fe70288c480b2d89 (diff)
downloadmpv-7bb3929a5dbe99631e690104a9af63c17dc3a355.tar.bz2
mpv-7bb3929a5dbe99631e690104a9af63c17dc3a355.tar.xz
configure: enable libavdevice by default
Used to be disabled by default, because libavdevice depends on libavfilter, and earlier versions of libavfilter exports symbols that clash with mpv's due to its MPlayer filter wrapper. Our configure script explicitly detects these symbols now, and we can use that to safely auto-detect libavdevice too. If we detect that libavfilter can't be safely used, libavdevice is disabled as well.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure5
1 files changed, 3 insertions, 2 deletions
diff --git a/configure b/configure
index b27d9b8fce..76b8a9222b 100755
--- a/configure
+++ b/configure
@@ -490,7 +490,7 @@ _rpath=no
libpostproc=auto
libavfilter=auto
vf_lavfi=auto
-libavdevice=no
+libavdevice=auto
_stream_cache=yes
_priority=no
def_dos_paths="#define HAVE_DOS_PATHS 0"
@@ -2749,7 +2749,8 @@ echores "$vf_lavfi"
echocheck "libavdevice >= 54.0.0"
if test "$libavdevice" = auto ; then
libavdevice=no
- if pkg_config_add "libavdevice >= 54.0.0" ; then
+ # Usually, libavdevice depends on libavfilter
+ if test "$libavfilter" = yes && pkg_config_add "libavdevice >= 54.0.0" ; then
libavdevice=yes
fi
fi