comparison configure @ 20984:41773d188756

Remove obsolete Xvid 3 support.
author diego
date Sat, 18 Nov 2006 02:40:19 +0000
parents bbe37270c6ad
children 20110e4437c6
comparison
equal deleted inserted replaced
20983:4da452b25fd5 20984:41773d188756
273 --disable-win32 disable Win32 DLL support [enabled] 273 --disable-win32 disable Win32 DLL support [enabled]
274 --disable-qtx disable QuickTime codecs support [enabled] 274 --disable-qtx disable QuickTime codecs support [enabled]
275 --disable-xanim disable XAnim codecs support [enabled] 275 --disable-xanim disable XAnim codecs support [enabled]
276 --disable-real disable RealPlayer codecs support [enabled] 276 --disable-real disable RealPlayer codecs support [enabled]
277 --disable-xvid disable XviD [autodetect] 277 --disable-xvid disable XviD [autodetect]
278 --disable-xvid3 disable XviD 3 [autodetect]
279 --disable-x264 disable x264 [autodetect] 278 --disable-x264 disable x264 [autodetect]
280 --disable-nut disable libnut [autodetect] 279 --disable-nut disable libnut [autodetect]
281 --disable-libavutil disable libavutil [autodetect] 280 --disable-libavutil disable libavutil [autodetect]
282 --disable-libavcodec disable libavcodec [autodetect] 281 --disable-libavcodec disable libavcodec [autodetect]
283 --disable-libavformat disable libavformat [autodetect] 282 --disable-libavformat disable libavformat [autodetect]
1657 _winsock2=auto 1656 _winsock2=auto
1658 _smbsupport=auto 1657 _smbsupport=auto
1659 _vidix_internal=auto 1658 _vidix_internal=auto
1660 _vidix_external=auto 1659 _vidix_external=auto
1661 _joystick=no 1660 _joystick=no
1662 _xvid3=auto
1663 _xvid=auto 1661 _xvid=auto
1664 _x264=auto 1662 _x264=auto
1665 _nut=auto 1663 _nut=auto
1666 _lirc=auto 1664 _lirc=auto
1667 _lircc=auto 1665 _lircc=auto
1920 --disable-vidix-internal) _vidix_internal=no ;; 1918 --disable-vidix-internal) _vidix_internal=no ;;
1921 --enable-vidix-external) _vidix_external=yes ;; 1919 --enable-vidix-external) _vidix_external=yes ;;
1922 --disable-vidix-external) _vidix_external=no ;; 1920 --disable-vidix-external) _vidix_external=no ;;
1923 --enable-joystick) _joystick=yes ;; 1921 --enable-joystick) _joystick=yes ;;
1924 --disable-joystick) _joystick=no ;; 1922 --disable-joystick) _joystick=no ;;
1925 --enable-xvid3) _xvid3=yes ;;
1926 --disable-xvid3) _xvid3=no ;;
1927 --enable-xvid) _xvid=yes ;; 1923 --enable-xvid) _xvid=yes ;;
1928 --disable-xvid) _xvid=no ;; 1924 --disable-xvid) _xvid=no ;;
1929 --enable-x264) _x264=yes ;; 1925 --enable-x264) _x264=yes ;;
1930 --disable-x264) _x264=no ;; 1926 --disable-x264) _x264=no ;;
1931 --enable-nut) _nut=yes ;; 1927 --enable-nut) _nut=yes ;;
6407 _novomodules="bl $_novomodules" 6403 _novomodules="bl $_novomodules"
6408 fi 6404 fi
6409 echores "$_bl" 6405 echores "$_bl"
6410 6406
6411 6407
6412 echocheck "XviD 3"
6413 if test "$_xvid3" = auto ; then
6414 cat > $TMPC << EOF
6415 #include <xvid.h>
6416 int main(void) { xvid_init(0, 0, 0, 0); return 0; }
6417 EOF
6418 _ld_xvid="$_ld_xvid -lxvidcore"
6419 _xvid3=no
6420 cc_check $_ld_xvid -lxvidcore $_ld_lm && _xvid3=yes
6421 fi
6422
6423 if test "$_xvid3" = yes ; then
6424 _def_xvid3='#define HAVE_XVID3 1'
6425 _codecmodules="xvid3 $_codecmodules"
6426 else
6427 _def_xvid3='#undef HAVE_XVID3'
6428 _nocodecmodules="xvid3 $_nocodecmodules"
6429 _ld_xvid=""
6430 fi
6431 echores "$_xvid3"
6432
6433
6434 echocheck "XviD" 6408 echocheck "XviD"
6435 if test "$_xvid" = auto ; then 6409 if test "$_xvid" = auto ; then
6436 _xvid=no 6410 _xvid=no
6437 _ld_xvid="$_ld_xvid -lxvidcore $_ld_lm" 6411 _ld_xvid="$_ld_xvid -lxvidcore $_ld_lm"
6438 cat > $TMPC << EOF 6412 cat > $TMPC << EOF
7482 CONFIG_LIBAVFORMAT_SO = $_libavformat_so 7456 CONFIG_LIBAVFORMAT_SO = $_libavformat_so
7483 CONFIG_LIBPOSTPROC = $_libpostproc 7457 CONFIG_LIBPOSTPROC = $_libpostproc
7484 CONFIG_LIBPOSTPROC_SO = $_libpostproc_so 7458 CONFIG_LIBPOSTPROC_SO = $_libpostproc_so
7485 ZORAN = $_zr 7459 ZORAN = $_zr
7486 LIBDV = $_libdv 7460 LIBDV = $_libdv
7487 XVID3 = $_xvid3
7488 XVID4 = $_xvid 7461 XVID4 = $_xvid
7489 X264 = $_x264 7462 X264 = $_x264
7490 LIBNUT = $_nut 7463 LIBNUT = $_nut
7491 CONFIG_DTS = $_libdts 7464 CONFIG_DTS = $_libdts
7492 MENCODER = $_mencoder 7465 MENCODER = $_mencoder
7651 /* Define this to compile stream-caching support, it can be enabled via 7624 /* Define this to compile stream-caching support, it can be enabled via
7652 -cache <kilobytes> */ 7625 -cache <kilobytes> */
7653 #define USE_STREAM_CACHE 1 7626 #define USE_STREAM_CACHE 1
7654 7627
7655 /* Define if you are using XviD library */ 7628 /* Define if you are using XviD library */
7656 $_def_xvid3
7657 $_def_xvid 7629 $_def_xvid
7658 7630
7659 /* Define if you are using the X.264 library */ 7631 /* Define if you are using the X.264 library */
7660 $_def_x264 7632 $_def_x264
7661 7633