# HG changeset patch
# User iive
# Date 1299859603 0
# Node ID 046b8e18127ebf791deffd88479a35cf3284cc82
# Parent  983a6e18b80d2f3e867b282224e4f1973d1327dd
Merge the configure CrystalHD dummy detection with
the proper detection from the patch by
Philip Langdale - mplayer.philipl at overt.org.

The option remains disabled by default.

diff -r 983a6e18b80d -r 046b8e18127e configure
--- a/configure	Fri Mar 11 15:50:42 2011 +0000
+++ b/configure	Fri Mar 11 16:06:43 2011 +0000
@@ -4411,17 +4411,23 @@
 fi
 echores "$_vdpau"
 
+
 echocheck "CrystalHD"
 if test "$_crystalhd" = auto ; then
-  _crystalhd=yes
+  _crystalhd=no
+  statement_check_broken libcrystalhd/bc_dts_types.h libcrystalhd/libcrystalhd_if.h 'DtsGetVersion(0, 0, 0)' -lcrystalhd $_ld_lm && _crystalhd=yes
 fi
 if test "$_crystalhd" = yes ; then
+  extra_ldflags="$extra_ldflags -lcrystalhd"
   def_crystalhd='#define CONFIG_CRYSTALHD 1'
+  codecmodules="crystalhd $codecmodules"
 else
   def_crystalhd='#define CONFIG_CRYSTALHD 0'
+  nocodecmodules="crystalhd $nocodecmodules"
   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"
+echores "$_crystalhd"
+
 
 echocheck "Xinerama"
 if test "$_xinerama" = auto ; then