diff options
| author | corey <corey@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-03-21 05:36:10 +0000 |
|---|---|---|
| committer | corey <corey@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-03-21 05:36:10 +0000 |
| commit | 0e4ebf5383d85d033ae6a0bab19b931536beb5d2 (patch) | |
| tree | 35c1cc5e985b4e98c9281b2e459b6afd6d637bb3 /configure | |
| parent | 4c4c2bd8e0c1f25806472cf44d6bece947c605a5 (diff) | |
| download | mpv-0e4ebf5383d85d033ae6a0bab19b931536beb5d2.tar.bz2 mpv-0e4ebf5383d85d033ae6a0bab19b931536beb5d2.tar.xz | |
Prevent building lavc with xvid support unless xvid version is 1.1 or
higher.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17905 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 19 |
1 files changed, 17 insertions, 2 deletions
@@ -6364,7 +6364,6 @@ EOF _xvid4=yes _def_xvid3='#undef HAVE_XVID3' _def_xvid4='#define HAVE_XVID4 1' - _def_lavc_xvid='#define CONFIG_XVID 1' _codecmodules="xvid $_codecmodules" else _xvid=no @@ -6376,6 +6375,22 @@ EOF fi echores "$_xvid" +if test "$_xvid4" = yes ; then + echocheck "XviD 1.1 or higher" + cat > $TMPC << EOF +#include <xvid.h> +int main(void) { xvid_plugin_2pass2_t s; s.vbv_size=0; return 0; } +EOF + if cc_check $_inc_xvid $_ld_xvid $_ld_lb ; then + _lavc_xvid=yes + _def_lavc_xvid='#define CONFIG_XVID 1' + else + _lavc_xvid=no + _def_lavc_xvid='#undef CONFIG_XVID' + fi + echores "$_lavc_xvid" +fi + _xvidcompat=no _def_decore_xvid='#undef DECORE_XVID' _def_encore_xvid='#undef ENCORE_XVID' @@ -7387,7 +7402,7 @@ AMR_NB_FIXED=$_amr_nb_fixed AMR_WB=$_amr_wb `echo $_libavcodecs | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'` CONFIG_FAAC=$_faac -CONFIG_XVID=$_xvid4 +CONFIG_XVID=$_lavc_xvid CONFIG_GPL=yes CONFIG_MUXERS=yes |