Mercurial > mplayer.hg
comparison configure @ 17886:d526e19c56c3
Support libavcodec vrc_strategy=1 (XviD ratecontrol).
As a side effect, this also makes -lavcopts vcodec=xvid work.
author | corey |
---|---|
date | Fri, 17 Mar 2006 23:47:10 +0000 |
parents | 8dd9503e4d19 |
children | 7d8df0bb1287 |
comparison
equal
deleted
inserted
replaced
17885:c04102e27eba | 17886:d526e19c56c3 |
---|---|
6346 cat > $TMPC << EOF | 6346 cat > $TMPC << EOF |
6347 #include <xvid.h> | 6347 #include <xvid.h> |
6348 int main(void) { xvid_init(0, 0, 0, 0); return 0; } | 6348 int main(void) { xvid_init(0, 0, 0, 0); return 0; } |
6349 EOF | 6349 EOF |
6350 _ld_xvid="$_ld_xvid -lxvidcore" | 6350 _ld_xvid="$_ld_xvid -lxvidcore" |
6351 _xvid4=no | |
6351 if test "$_xvid" != no && cc_check $_inc_xvid $_ld_xvid $_ld_lm ; then | 6352 if test "$_xvid" != no && cc_check $_inc_xvid $_ld_xvid $_ld_lm ; then |
6352 _xvid=yes | 6353 _xvid=yes |
6353 _def_xvid3='#define HAVE_XVID3 1' | 6354 _def_xvid3='#define HAVE_XVID3 1' |
6354 _def_xvid4='#undef HAVE_XVID4' | 6355 _def_xvid4='#undef HAVE_XVID4' |
6355 _codecmodules="xvid $_codecmodules" | 6356 _codecmodules="xvid $_codecmodules" |
6358 #include <xvid.h> | 6359 #include <xvid.h> |
6359 int main(void) { xvid_global(0, 0, 0, 0); return 0; } | 6360 int main(void) { xvid_global(0, 0, 0, 0); return 0; } |
6360 EOF | 6361 EOF |
6361 if test "$_xvid" != no && cc_check $_inc_xvid $_ld_xvid $_ld_lm ; then | 6362 if test "$_xvid" != no && cc_check $_inc_xvid $_ld_xvid $_ld_lm ; then |
6362 _xvid=yes | 6363 _xvid=yes |
6364 _xvid4=yes | |
6363 _def_xvid3='#undef HAVE_XVID3' | 6365 _def_xvid3='#undef HAVE_XVID3' |
6364 _def_xvid4='#define HAVE_XVID4 1' | 6366 _def_xvid4='#define HAVE_XVID4 1' |
6367 _def_lavc_xvid='#define CONFIG_XVID 1' | |
6365 _codecmodules="xvid $_codecmodules" | 6368 _codecmodules="xvid $_codecmodules" |
6366 else | 6369 else |
6367 _xvid=no | 6370 _xvid=no |
6368 _ld_xvid='' | 6371 _ld_xvid='' |
6369 _def_xvid3='#undef HAVE_XVID3' | 6372 _def_xvid3='#undef HAVE_XVID3' |
7382 AMR_NB=$_amr_nb | 7385 AMR_NB=$_amr_nb |
7383 AMR_NB_FIXED=$_amr_nb_fixed | 7386 AMR_NB_FIXED=$_amr_nb_fixed |
7384 AMR_WB=$_amr_wb | 7387 AMR_WB=$_amr_wb |
7385 `echo $_libavcodecs | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'` | 7388 `echo $_libavcodecs | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'` |
7386 CONFIG_FAAC=$_faac | 7389 CONFIG_FAAC=$_faac |
7390 CONFIG_XVID=$_xvid4 | |
7387 CONFIG_GPL=yes | 7391 CONFIG_GPL=yes |
7388 CONFIG_MUXERS=yes | 7392 CONFIG_MUXERS=yes |
7389 | 7393 |
7390 # --- Some stuff for autoconfigure ---- | 7394 # --- Some stuff for autoconfigure ---- |
7391 $_target_arch | 7395 $_target_arch |
7748 $_def_amr_wb | 7752 $_def_amr_wb |
7749 | 7753 |
7750 /* Use specific codecs from libavcodec */ | 7754 /* Use specific codecs from libavcodec */ |
7751 `echo $_libavcodecs | tr '[a-z] ' '[A-Z]\n' | sed 's/^/#define CONFIG_/;s/$/ 1/'` | 7755 `echo $_libavcodecs | tr '[a-z] ' '[A-Z]\n' | sed 's/^/#define CONFIG_/;s/$/ 1/'` |
7752 $_def_lavc_faac | 7756 $_def_lavc_faac |
7757 $_def_lavc_xvid | |
7753 | 7758 |
7754 /* Use codec libs included in mplayer CVS / source dist: */ | 7759 /* Use codec libs included in mplayer CVS / source dist: */ |
7755 $_def_mp3lib | 7760 $_def_mp3lib |
7756 $_def_liba52 | 7761 $_def_liba52 |
7757 $_def_libdts | 7762 $_def_libdts |