Mercurial > mplayer.hg

comparison configure @ 20776:72b7811b21d3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename xvid4 variable/option back to xvid so as not to break scripts.
author diego
date Wed, 08 Nov 2006 18:46:03 +0000
parents eb2c12485aac
children ee79769c9e30
comparison
equal deleted inserted replaced
20775:05159ef5282e 20776:72b7811b21d3
271 --enable-liblzo enable external liblzo [autodetect] 271 --enable-liblzo enable external liblzo [autodetect]
272 --disable-win32 disable Win32 DLL support [enabled] 272 --disable-win32 disable Win32 DLL support [enabled]
273 --disable-qtx disable QuickTime codecs support [enabled] 273 --disable-qtx disable QuickTime codecs support [enabled]
274 --disable-xanim disable XAnim codecs support [enabled] 274 --disable-xanim disable XAnim codecs support [enabled]
275 --disable-real disable RealPlayer codecs support [enabled] 275 --disable-real disable RealPlayer codecs support [enabled]
276 --disable-xvid4 disable XviD 4 [autodetect] 276 --disable-xvid disable XviD [autodetect]
277 --disable-xvid3 disable XviD 3 [autodetect] 277 --disable-xvid3 disable XviD 3 [autodetect]
278 --disable-x264 disable x264 [autodetect] 278 --disable-x264 disable x264 [autodetect]
279 --disable-nut disable libnut [autodetect] 279 --disable-nut disable libnut [autodetect]
280 --disable-libavutil disable libavutil [autodetect] 280 --disable-libavutil disable libavutil [autodetect]
281 --disable-libavcodec disable libavcodec [autodetect] 281 --disable-libavcodec disable libavcodec [autodetect]
1656 _smbsupport=auto 1656 _smbsupport=auto
1657 _vidix_internal=auto 1657 _vidix_internal=auto
1658 _vidix_external=auto 1658 _vidix_external=auto
1659 _joystick=no 1659 _joystick=no
1660 _xvid3=auto 1660 _xvid3=auto
1661 _xvid4=auto 1661 _xvid=auto
1662 _x264=auto 1662 _x264=auto
1663 _nut=auto 1663 _nut=auto
1664 _lirc=auto 1664 _lirc=auto
1665 _lircc=auto 1665 _lircc=auto
1666 _gui=no 1666 _gui=no
1918 --disable-vidix-external) _vidix_external=no ;; 1918 --disable-vidix-external) _vidix_external=no ;;
1919 --enable-joystick) _joystick=yes ;; 1919 --enable-joystick) _joystick=yes ;;
1920 --disable-joystick) _joystick=no ;; 1920 --disable-joystick) _joystick=no ;;
1921 --enable-xvid3) _xvid3=yes ;; 1921 --enable-xvid3) _xvid3=yes ;;
1922 --disable-xvid3) _xvid3=no ;; 1922 --disable-xvid3) _xvid3=no ;;
1923 --enable-xvid4) _xvid4=yes ;; 1923 --enable-xvid) _xvid=yes ;;
1924 --disable-xvid4) _xvid4=no ;; 1924 --disable-xvid) _xvid=no ;;
1925 --enable-x264) _x264=yes ;; 1925 --enable-x264) _x264=yes ;;
1926 --disable-x264) _x264=no ;; 1926 --disable-x264) _x264=no ;;
1927 --enable-nut) _nut=yes ;; 1927 --enable-nut) _nut=yes ;;
1928 --disable-nut) _nut=no ;; 1928 --disable-nut) _nut=no ;;
1929 --enable-libavutil) _libavutil=yes ;; 1929 --enable-libavutil) _libavutil=yes ;;
6404 _nocodecmodules="xvid3 $_nocodecmodules" 6404 _nocodecmodules="xvid3 $_nocodecmodules"
6405 fi 6405 fi
6406 echores "$_xvid3" 6406 echores "$_xvid3"
6407 6407
6408 6408
6409 echocheck "XviD 4" 6409 echocheck "XviD"
6410 if test "$_xvid4" = auto ; then 6410 if test "$_xvid" = auto ; then
6411 _xvid4=no 6411 _xvid=no
6412 _ld_xvid="$_ld_xvid -lxvidcore $_ld_lm" 6412 _ld_xvid="$_ld_xvid -lxvidcore $_ld_lm"
6413 cat > $TMPC << EOF 6413 cat > $TMPC << EOF
6414 #include <xvid.h> 6414 #include <xvid.h>
6415 int main(void) { xvid_global(0, 0, 0, 0); return 0; } 6415 int main(void) { xvid_global(0, 0, 0, 0); return 0; }
6416 EOF 6416 EOF
6417 for _ld_tmp in "$_ld_xvid" "$_ld_xvid $_ld_pthread" ; do 6417 for _ld_tmp in "$_ld_xvid" "$_ld_xvid $_ld_pthread" ; do
6418 cc_check $_ld_tmp && _ld_xvid="$_ld_tmp" && _xvid4=yes && break 6418 cc_check $_ld_tmp && _ld_xvid="$_ld_tmp" && _xvid=yes && break
6419 done 6419 done
6420 fi 6420 fi
6421 6421
6422 if test "$_xvid4" = yes ; then 6422 if test "$_xvid" = yes ; then
6423 _def_xvid4='#define HAVE_XVID4 1' 6423 _def_xvid='#define HAVE_XVID4 1'
6424 _codecmodules="xvid4 $_codecmodules" 6424 _codecmodules="xvid $_codecmodules"
6425 else 6425 else
6426 _def_xvid4='#undef HAVE_XVID4' 6426 _def_xvid='#undef HAVE_XVID4'
6427 _nocodecmodules="xvid4 $_nocodecmodules" 6427 _nocodecmodules="xvid $_nocodecmodules"
6428 fi 6428 fi
6429 echores "$_xvid4" 6429 echores "$_xvid"
6430 6430
6431 if test "$_xvid4" = yes ; then 6431 if test "$_xvid" = yes ; then
6432 echocheck "XviD two pass plugin" 6432 echocheck "XviD two pass plugin"
6433 cat > $TMPC << EOF 6433 cat > $TMPC << EOF
6434 #include <xvid.h> 6434 #include <xvid.h>
6435 int main(void) { xvid_plugin_2pass2_t s; s.vbv_size=0; return 0; } 6435 int main(void) { xvid_plugin_2pass2_t s; s.vbv_size=0; return 0; }
6436 EOF 6436 EOF
7441 CONFIG_LIBPOSTPROC = $_libpostproc 7441 CONFIG_LIBPOSTPROC = $_libpostproc
7442 CONFIG_LIBPOSTPROC_SO = $_libpostproc_so 7442 CONFIG_LIBPOSTPROC_SO = $_libpostproc_so
7443 ZORAN = $_zr 7443 ZORAN = $_zr
7444 LIBDV = $_libdv 7444 LIBDV = $_libdv
7445 XVID3 = $_xvid3 7445 XVID3 = $_xvid3
7446 XVID4 = $_xvid4 7446 XVID4 = $_xvid
7447 X264 = $_x264 7447 X264 = $_x264
7448 LIBNUT = $_nut 7448 LIBNUT = $_nut
7449 CONFIG_DTS = $_libdts 7449 CONFIG_DTS = $_libdts
7450 MENCODER = $_mencoder 7450 MENCODER = $_mencoder
7451 CDDA = $_cdda 7451 CDDA = $_cdda
7610 -cache <kilobytes> */ 7610 -cache <kilobytes> */
7611 #define USE_STREAM_CACHE 1 7611 #define USE_STREAM_CACHE 1
7612 7612
7613 /* Define if you are using XviD library */ 7613 /* Define if you are using XviD library */
7614 $_def_xvid3 7614 $_def_xvid3
7615 $_def_xvid4 7615 $_def_xvid
7616 $_def_decore_xvid 7616 $_def_decore_xvid
7617 $_def_encore_xvid 7617 $_def_encore_xvid
7618 7618
7619 /* Define if you are using the X.264 library */ 7619 /* Define if you are using the X.264 library */
7620 $_def_x264 7620 $_def_x264