comparison configure @ 26883:a365271c97a5

Revert commit r26897. XviD is the correct spelling of the codec. You can see it written in the codec own documentation and header files. Prefered name capitalization confirmed in conversation with XviD developer (prunedtree).
author iive
date Wed, 28 May 2008 23:04:41 +0000
parents aa81249bfedb
children 3aa8ad5202ea
comparison
equal deleted inserted replaced
26882:8eacd1538e64 26883:a365271c97a5
284 --enable-liblzo enable external liblzo [autodetect] 284 --enable-liblzo enable external liblzo [autodetect]
285 --disable-win32dll disable Win32 DLL support [enabled] 285 --disable-win32dll disable Win32 DLL support [enabled]
286 --disable-qtx disable QuickTime codecs support [enabled] 286 --disable-qtx disable QuickTime codecs support [enabled]
287 --disable-xanim disable XAnim codecs support [enabled] 287 --disable-xanim disable XAnim codecs support [enabled]
288 --disable-real disable RealPlayer codecs support [enabled] 288 --disable-real disable RealPlayer codecs support [enabled]
289 --disable-xvid disable Xvid [autodetect] 289 --disable-xvid disable XviD [autodetect]
290 --disable-xvid-lavc disable Xvid in libavcodec [autodetect] 290 --disable-xvid-lavc disable XviD in libavcodec [autodetect]
291 --disable-x264 disable x264 [autodetect] 291 --disable-x264 disable x264 [autodetect]
292 --disable-x264-lavc disable x264 in libavcodec [autodetect] 292 --disable-x264-lavc disable x264 in libavcodec [autodetect]
293 --disable-libnut disable libnut [autodetect] 293 --disable-libnut disable libnut [autodetect]
294 --disable-libavutil_a disable static libavutil [autodetect] 294 --disable-libavutil_a disable static libavutil [autodetect]
295 --disable-libavcodec_a disable static libavcodec [autodetect] 295 --disable-libavcodec_a disable static libavcodec [autodetect]
6531 _nocodecmodules="libdv $_nocodecmodules" 6531 _nocodecmodules="libdv $_nocodecmodules"
6532 fi 6532 fi
6533 echores "$_libdv" 6533 echores "$_libdv"
6534 6534
6535 6535
6536 echocheck "Xvid" 6536 echocheck "XviD"
6537 if test "$_xvid" = auto ; then 6537 if test "$_xvid" = auto ; then
6538 _xvid=no 6538 _xvid=no
6539 cat > $TMPC << EOF 6539 cat > $TMPC << EOF
6540 #include <xvid.h> 6540 #include <xvid.h>
6541 int main(void) { xvid_global(0, 0, 0, 0); return 0; } 6541 int main(void) { xvid_global(0, 0, 0, 0); return 0; }
6552 _def_xvid='#undef HAVE_XVID4' 6552 _def_xvid='#undef HAVE_XVID4'
6553 _nocodecmodules="xvid $_nocodecmodules" 6553 _nocodecmodules="xvid $_nocodecmodules"
6554 fi 6554 fi
6555 echores "$_xvid" 6555 echores "$_xvid"
6556 6556
6557 echocheck "Xvid two pass plugin" 6557 echocheck "XviD two pass plugin"
6558 if test "$_xvid" = yes && test "$_xvid_lavc" = auto ; then 6558 if test "$_xvid" = yes && test "$_xvid_lavc" = auto ; then
6559 cat > $TMPC << EOF 6559 cat > $TMPC << EOF
6560 #include <xvid.h> 6560 #include <xvid.h>
6561 int main(void) { xvid_plugin_2pass2_t s; s.vbv_size=0; return 0; } 6561 int main(void) { xvid_plugin_2pass2_t s; s.vbv_size=0; return 0; }
6562 EOF 6562 EOF
7934 7934
7935 /* Define this to compile stream-caching support, it can be enabled via 7935 /* Define this to compile stream-caching support, it can be enabled via
7936 -cache <kilobytes> */ 7936 -cache <kilobytes> */
7937 $_def_stream_cache 7937 $_def_stream_cache
7938 7938
7939 /* Define if you are using Xvid library */ 7939 /* Define if you are using XviD library */
7940 $_def_xvid 7940 $_def_xvid
7941 7941
7942 /* Define if you are using the X.264 library */ 7942 /* Define if you are using the X.264 library */
7943 $_def_x264 7943 $_def_x264
7944 7944