From 991d64b31f076b9e2128dd47b17aa1554e166571 Mon Sep 17 00:00:00 2001
From: uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Tue, 17 Feb 2009 00:09:15 +0000
Subject: [PATCH] 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
---
 configure         | 2 +-
 libvo/video_out.c | 2 +-
 2 files changed, 2 insertions(+), 2 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"
 
diff --git a/libvo/video_out.c b/libvo/video_out.c
index 54291cfce9..2089eeb63d 100644
--- a/libvo/video_out.c
+++ b/libvo/video_out.c
@@ -170,7 +170,7 @@ const vo_functions_t* const video_out_drivers[] =
 #ifdef CONFIG_3DFX
         &video_out_3dfx,
 #endif
-#ifdef CONFIG_VDPAU
+#if CONFIG_VDPAU
         &video_out_vdpau,
 #endif
 #ifdef CONFIG_XV