Mercurial > mplayer.hg

changeset 28585:7d42a45c225d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author uau
date Tue, 17 Feb 2009 00:09:15 +0000
parents 239a2ceda4ff
children 7c20cc8fda01
files configure libvo/video_out.c
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Mon Feb 16 23:56:19 2009 +0000
+++ b/configure	Tue Feb 17 00:09:15 2009 +0000
@@ -4311,7 +4311,7 @@
 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"
 
--- a/libvo/video_out.c	Mon Feb 16 23:56:19 2009 +0000
+++ b/libvo/video_out.c	Tue Feb 17 00:09:15 2009 +0000
@@ -170,7 +170,7 @@
 #ifdef CONFIG_3DFX
         &video_out_3dfx,
 #endif
-#ifdef CONFIG_VDPAU
+#if CONFIG_VDPAU
         &video_out_vdpau,
 #endif
 #ifdef CONFIG_XV