# HG changeset patch # User ben # Date 1213990412 0 # Node ID 5cafd67e6c9093634677b9d2b455785d47e07651 # Parent e538f3e34cd0065d19b88bb64a842a4cee4c71cd Allow conditional compilation of yuv4mpeg video out. diff -r e538f3e34cd0 -r 5cafd67e6c90 Makefile --- a/Makefile Fri Jun 20 19:31:21 2008 +0000 +++ b/Makefile Fri Jun 20 19:33:32 2008 +0000 @@ -521,7 +521,6 @@ libvo/video_out.c \ libvo/vo_mpegpes.c \ libvo/vo_null.c \ - libvo/vo_yuv4mpeg.c \ $(addprefix libvo/,$(VO_SRCS)) \ SRCS_MPLAYER-$(APPLE_IR) += input/appleir.c diff -r e538f3e34cd0 -r 5cafd67e6c90 configure --- a/configure Fri Jun 20 19:31:21 2008 +0000 +++ b/configure Fri Jun 20 19:33:32 2008 +0000 @@ -385,6 +385,7 @@ --disable-tga disable Targa video output [enable] --disable-pnm disable PNM video output [enable] --disable-md5sum disable md5sum video output [enable] + --disable-yuv4mpeg disable md5sum video output [enable] Audio output: --disable-alsa disable ALSA audio output [autodetect] @@ -533,6 +534,7 @@ _jpeg=auto _pnm=yes _md5sum=yes +_yuv4mpeg=yes _gif=auto _gl=auto _ggi=auto @@ -852,6 +854,8 @@ --disable-pnm) _pnm=no ;; --enable-md5sum) _md5sum=yes ;; --disable-md5sum) _md5sum=no ;; + --enable-yuv4mpeg) _yuv4mpeg=yes ;; + --disable-yuv4mpeg) _yuv4mpeg=no ;; --enable-gif) _gif=yes ;; --disable-gif) _gif=no ;; --enable-gl) _gl=yes ;; @@ -3779,6 +3783,18 @@ echores "$_md5sum" +echocheck "yuv4mpeg support" +if test "$_yuv4mpeg" = yes; then + _def_yuv4mpeg="#define HAVE_YUV4MPEG" + _vosrc="$_vosrc vo_yuv4mpeg.c" + _vomodules="yuv4mpeg $_vomodules" +else + _def_yuv4mpeg="#undef HAVE_YUV4MPEG" + _novomodules="yuv4mpeg $_novomodules" +fi +echores "$_yuv4mpeg" + + echocheck "bl" if test "$_bl" = yes ; then _def_bl='#define HAVE_BL 1' @@ -8369,6 +8385,9 @@ /* enable md5sum support */ $_def_md5sum +/* enable yuv4mpeg support */ +$_def_yuv4mpeg + /* enable GIF support */ $_def_gif $_def_gif_4 diff -r e538f3e34cd0 -r 5cafd67e6c90 libvo/video_out.c --- a/libvo/video_out.c Fri Jun 20 19:31:21 2008 +0000 +++ b/libvo/video_out.c Fri Jun 20 19:33:32 2008 +0000 @@ -221,7 +221,9 @@ &video_out_xvmc, #endif &video_out_mpegpes, +#ifdef HAVE_YUV4MPEG &video_out_yuv4mpeg, +#endif #ifdef HAVE_PNG &video_out_png, #endif