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
This commit is contained in:
uau 2009-02-17 00:09:15 +00:00
parent 288f25d8d9
commit 991d64b31f
2 changed files with 2 additions and 2 deletions

2
configure vendored
View File

@ -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"

View File

@ -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