Mercurial > mplayer.hg
changeset 17904:0c17a2c4460d
Prevent building lavc with xvid support unless xvid version is 1.1 or
higher.
| author | corey |
|---|---|
| date | Tue, 21 Mar 2006 05:36:10 +0000 |
| parents | b4f7c30423f5 |
| children | 433494f162a9 |
| files | DOCS/man/en/mplayer.1 configure |
| diffstat | 2 files changed, 18 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/DOCS/man/en/mplayer.1 Mon Mar 20 23:16:34 2006 +0000 +++ b/DOCS/man/en/mplayer.1 Tue Mar 21 05:36:10 2006 +0000 @@ -7097,7 +7097,7 @@ Use internal lavc ratecontrol (default). .IPs 1 Use XviD ratecontrol (experimental; requires MEncoder to be compiled -with XviD support). +with support for XviD 1.1 or higher). .RE .PD 1 .
--- a/configure Mon Mar 20 23:16:34 2006 +0000 +++ b/configure Tue Mar 21 05:36:10 2006 +0000 @@ -6364,7 +6364,6 @@ _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 @@ 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_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