summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-02-26 18:37:19 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-02-26 18:37:19 +0200
commit74ffb51f33764fecaf94f5c1a429b553272bd196 (patch)
tree24de42552a2ae32e28fb7eae87ecb41f2ff37d17 /configure
parent5ff421bf5d7e08a2003a333d1db49e7756f4fe2e (diff)
downloadmpv-74ffb51f33764fecaf94f5c1a429b553272bd196.tar.bz2
mpv-74ffb51f33764fecaf94f5c1a429b553272bd196.tar.xz
build/vdpau: drop support for dynamic loading of libvdpau
After a recent library update on my system MPlayer started crashing on exit in XCloseDisplay() if -vo vdpau had been used. With normal linking it works OK. Since there should be little need for the dynamic loading functionality any more, I'll just drop it rather than try investigating the exact problem with dynamic loading and whether it would be fixable. VDPAU is now linked normally with -lvdpau if available.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure7
1 files changed, 5 insertions, 2 deletions
diff --git a/configure b/configure
index 177f33d261..38f2c380c3 100755
--- a/configure
+++ b/configure
@@ -4314,13 +4314,16 @@ if test "$_vdpau" = auto ; then
if test "$_dl" = yes ; then
cat > $TMPC <<EOF
#include <vdpau/vdpau_x11.h>
-int main(void) {return VDP_VIDEO_MIXER_ATTRIBUTE_SKIP_CHROMA_DEINTERLACE;}
+int main(void) {
+ (void) vdp_device_create_x11(0, 0, 0, 0);
+ return VDP_VIDEO_MIXER_ATTRIBUTE_SKIP_CHROMA_DEINTERLACE;}
EOF
- cc_check && _vdpau=yes
+ cc_check -lvdpau && _vdpau=yes
fi
fi
if test "$_vdpau" = yes ; then
def_vdpau='#define CONFIG_VDPAU 1'
+ libs_mplayer="$libs_mplayer -lvdpau"
_vomodules="vdpau $_vomodules"
else
def_vdpau='#define CONFIG_VDPAU 0'