mirror of https://github.com/mpv-player/mpv
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:
parent
288f25d8d9
commit
991d64b31f
|
@ -4311,7 +4311,7 @@ if test "$_vdpau" = yes ; then
|
||||||
else
|
else
|
||||||
def_vdpau='#define CONFIG_VDPAU 0'
|
def_vdpau='#define CONFIG_VDPAU 0'
|
||||||
_novomodules="vdpau $_novomodules"
|
_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
|
fi
|
||||||
echores "$_vdpau"
|
echores "$_vdpau"
|
||||||
|
|
||||||
|
|
|
@ -170,7 +170,7 @@ const vo_functions_t* const video_out_drivers[] =
|
||||||
#ifdef CONFIG_3DFX
|
#ifdef CONFIG_3DFX
|
||||||
&video_out_3dfx,
|
&video_out_3dfx,
|
||||||
#endif
|
#endif
|
||||||
#ifdef CONFIG_VDPAU
|
#if CONFIG_VDPAU
|
||||||
&video_out_vdpau,
|
&video_out_vdpau,
|
||||||
#endif
|
#endif
|
||||||
#ifdef CONFIG_XV
|
#ifdef CONFIG_XV
|
||||||
|
|
Loading…
Reference in New Issue