Mercurial > mplayer.hg
changeset 32986:983a6e18b80d
Fix MPlayer build after CrystalHD have been accepted in FFmpeg.
Add dummy detection to configure and set it to disabled.
| author | iive |
|---|---|
| date | Fri, 11 Mar 2011 15:50:42 +0000 |
| parents | ff128ac010ba |
| children | 046b8e18127e |
| files | configure |
| diffstat | 1 files changed, 17 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Fri Mar 11 14:05:29 2011 +0000 +++ b/configure Fri Mar 11 15:50:42 2011 +0000 @@ -476,6 +476,7 @@ --enable-xv enable Xv video output [autodetect] --enable-xvmc enable XvMC acceleration [disable] --enable-vdpau enable VDPAU acceleration [autodetect] + --enable-crystalhd enable CrystalHD acceleration (incomplete) [disable] --enable-vm enable XF86VidMode support [autodetect] --enable-xinerama enable Xinerama support [autodetect] --enable-x11 enable X11 video output [autodetect] @@ -659,6 +660,7 @@ _xv=auto _xvmc=no #auto when complete _vdpau=auto +_crystalhd=no _sdl=auto _kva=auto _direct3d=auto @@ -999,6 +1001,8 @@ --disable-xvmc) _xvmc=no ;; --enable-vdpau) _vdpau=yes ;; --disable-vdpau) _vdpau=no ;; + --enable-crystalhd) _crystalhd=yes ;; + --disable-crystalhd) _crystalhd=no ;; --enable-sdl) _sdl=yes ;; --disable-sdl) _sdl=no ;; --enable-kva) _kva=yes ;; @@ -4407,6 +4411,17 @@ fi echores "$_vdpau" +echocheck "CrystalHD" +if test "$_crystalhd" = auto ; then + _crystalhd=yes +fi +if test "$_crystalhd" = yes ; then + def_crystalhd='#define CONFIG_CRYSTALHD 1' +else + def_crystalhd='#define CONFIG_CRYSTALHD 0' + libavdecoders=$(echo $libavdecoders | sed -e s/H264_CRYSTALHD_DECODER// -e s/MPEG4_CRYSTALHD_DECODER// -e s/MPEG2_CRYSTALHD_DECODER// -e s/MSMPEG4_CRYSTALHD_DECODER// -e s/VC1_CRYSTALHD_DECODER// -e s/WMV3_CRYSTALHD_DECODER//) +fi +echores "$_CrystalHD" echocheck "Xinerama" if test "$_xinerama" = auto ; then @@ -8167,6 +8182,7 @@ CONFIG_LIBRTMP = $_librtmp CONFIG_BZLIB = $bzlib +CONFIG_CRYSTALHD= $_crystalhd CONFIG_ENCODERS = yes CONFIG_GPL = yes CONFIG_MLIB = $_mlib @@ -8509,6 +8525,7 @@ $def_bl $def_caca $def_corevideo +$def_crystalhd $def_dga $def_dga1 $def_dga2