[MPlayer-cvslog] r28620 - in trunk: configure libvo/video_out.c

[uau]

Author: uau
Date: Tue Feb 17 01:09:15 2009
New Revision: 28620

Log:
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.

Modified:
   trunk/configure
   trunk/libvo/video_out.c

Modified: trunk/configure
==============================================================================
--- trunk/configure	Tue Feb 17 00:56:19 2009	(r28619)
+++ trunk/configure	Tue Feb 17 01:09:15 2009	(r28620)
@@ -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"
 

Modified: trunk/libvo/video_out.c
==============================================================================
--- trunk/libvo/video_out.c	Tue Feb 17 00:56:19 2009	(r28619)
+++ trunk/libvo/video_out.c	Tue Feb 17 01:09:15 2009	(r28620)
@@ -170,7 +170,7 @@ const vo_functions_t* const video_out_dr
 #ifdef CONFIG_3DFX
         &video_out_3dfx,
 #endif
-#ifdef CONFIG_VDPAU
+#if CONFIG_VDPAU
         &video_out_vdpau,
 #endif
 #ifdef CONFIG_XV