summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authoruau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-02-17 00:09:15 +0000
committeruau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-02-17 00:09:15 +0000
commit991d64b31f076b9e2128dd47b17aa1554e166571 (patch)
tree7bc63045477ce563f0663e83bc4f662ab4e8978f /configure
parent288f25d8d9130e7515e854d2e65654b8667fb319 (diff)
downloadmpv-991d64b31f076b9e2128dd47b17aa1554e166571.tar.bz2
mpv-991d64b31f076b9e2128dd47b17aa1554e166571.tar.xz
Fix compilation without VDPAU
The commit adding vo_vdpau had two bugs that broke compilation when VDPAU was not enabled. - video_out.c used "#ifdef CONFIG_VDPAU", but it's always set to 0 or 1 - In configure, MPEG1_VDPAU_DECODER was dropped from the list of libavcodec codecs to disable when moving VDPAU-related ones from the always-disabled list to a conditinal one. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28620 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index 8eed59c29c..c519e40439 100755
--- a/configure
+++ b/configure
@@ -4311,7 +4311,7 @@ if test "$_vdpau" = yes ; then
else
def_vdpau='#define CONFIG_VDPAU 0'
_novomodules="vdpau $_novomodules"
- _libavdecoders=`echo $_libavdecoders | sed -e s/MPEG_VDPAU_DECODER// -e s/H264_VDPAU_DECODER// -e s/WMV3_VDPAU_DECODER// -e s/VC1_VDPAU_DECODER//`
+ _libavdecoders=`echo $_libavdecoders | sed -e s/MPEG_VDPAU_DECODER// -e s/MPEG1_VDPAU_DECODER// -e s/H264_VDPAU_DECODER// -e s/WMV3_VDPAU_DECODER// -e s/VC1_VDPAU_DECODER//`
fi
echores "$_vdpau"