diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-08 18:46:03 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-08 18:46:03 +0000 |
| commit | bd776149b167dd9b6928a9b75551d141ea8674ae (patch) | |
| tree | 7c763d178552369c6f6c88403c5905453ac3e861 /configure | |
| parent | 15a0cdbad68b6ea5b5d7534b28b960ee42fb74ab (diff) | |
| download | mpv-bd776149b167dd9b6928a9b75551d141ea8674ae.tar.bz2 mpv-bd776149b167dd9b6928a9b75551d141ea8674ae.tar.xz | |
Rename xvid4 variable/option back to xvid so as not to break scripts.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20792 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 34 |
1 files changed, 17 insertions, 17 deletions
@@ -273,7 +273,7 @@ Codecs: --disable-qtx disable QuickTime codecs support [enabled] --disable-xanim disable XAnim codecs support [enabled] --disable-real disable RealPlayer codecs support [enabled] - --disable-xvid4 disable XviD 4 [autodetect] + --disable-xvid disable XviD [autodetect] --disable-xvid3 disable XviD 3 [autodetect] --disable-x264 disable x264 [autodetect] --disable-nut disable libnut [autodetect] @@ -1658,7 +1658,7 @@ _vidix_internal=auto _vidix_external=auto _joystick=no _xvid3=auto -_xvid4=auto +_xvid=auto _x264=auto _nut=auto _lirc=auto @@ -1920,8 +1920,8 @@ for ac_option do --disable-joystick) _joystick=no ;; --enable-xvid3) _xvid3=yes ;; --disable-xvid3) _xvid3=no ;; - --enable-xvid4) _xvid4=yes ;; - --disable-xvid4) _xvid4=no ;; + --enable-xvid) _xvid=yes ;; + --disable-xvid) _xvid=no ;; --enable-x264) _x264=yes ;; --disable-x264) _x264=no ;; --enable-nut) _nut=yes ;; @@ -6406,29 +6406,29 @@ fi echores "$_xvid3" -echocheck "XviD 4" -if test "$_xvid4" = auto ; then - _xvid4=no +echocheck "XviD" +if test "$_xvid" = auto ; then + _xvid=no _ld_xvid="$_ld_xvid -lxvidcore $_ld_lm" cat > $TMPC << EOF #include <xvid.h> int main(void) { xvid_global(0, 0, 0, 0); return 0; } EOF for _ld_tmp in "$_ld_xvid" "$_ld_xvid $_ld_pthread" ; do - cc_check $_ld_tmp && _ld_xvid="$_ld_tmp" && _xvid4=yes && break + cc_check $_ld_tmp && _ld_xvid="$_ld_tmp" && _xvid=yes && break done fi -if test "$_xvid4" = yes ; then - _def_xvid4='#define HAVE_XVID4 1' - _codecmodules="xvid4 $_codecmodules" +if test "$_xvid" = yes ; then + _def_xvid='#define HAVE_XVID4 1' + _codecmodules="xvid $_codecmodules" else - _def_xvid4='#undef HAVE_XVID4' - _nocodecmodules="xvid4 $_nocodecmodules" + _def_xvid='#undef HAVE_XVID4' + _nocodecmodules="xvid $_nocodecmodules" fi -echores "$_xvid4" +echores "$_xvid" -if test "$_xvid4" = yes ; then +if test "$_xvid" = yes ; then echocheck "XviD two pass plugin" cat > $TMPC << EOF #include <xvid.h> @@ -7443,7 +7443,7 @@ CONFIG_LIBPOSTPROC_SO = $_libpostproc_so ZORAN = $_zr LIBDV = $_libdv XVID3 = $_xvid3 -XVID4 = $_xvid4 +XVID4 = $_xvid X264 = $_x264 LIBNUT = $_nut CONFIG_DTS = $_libdts @@ -7612,7 +7612,7 @@ $_def_stddef /* Define if you are using XviD library */ $_def_xvid3 -$_def_xvid4 +$_def_xvid $_def_decore_xvid $_def_encore_xvid |