diff options
| author | Diego Biurrun <diego@biurrun.de> | 2006-12-22 04:38:24 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2006-12-22 04:38:24 +0000 |
| commit | 56a059ac863af4f60c57243efd5e5a23f7dbcefc (patch) | |
| tree | c164b7eeef4ebf8dc7d565b31314e6373bf14fa7 | |
| parent | df32bc1213ae29fc6f7e0e724e59f55dd39ae40d (diff) | |
| download | ffmpeg-56a059ac863af4f60c57243efd5e5a23f7dbcefc.tar.gz | |
Make the X11 frame grabber disabled by default.
Originally committed as revision 7353 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rwxr-xr-x | configure | 11 | ||||
| -rw-r--r-- | libavformat/Makefile | 5 |
2 files changed, 15 insertions, 1 deletions
@@ -88,6 +88,7 @@ show_help(){ echo " --enable-amr_if2 enable amr_wb IF2 audio codec" echo " --enable-sunmlib use Sun medialib [default=no]" echo " --enable-pthreads use pthreads [default=no]" + echo " --enable-x11grab enable X11 grabbing [default=no]" echo " --enable-dc1394 enable IIDC-1394 grabbing using libdc1394" echo " and libraw1394 [default=no]" echo " --enable-swscaler software scaler support [default=no]" @@ -442,6 +443,7 @@ CONFIG_LIST=' video4linux video4linux2 wince + x11grab x264 xvid zlib @@ -574,6 +576,7 @@ video4linux2="yes" bktr="no" audio_oss="yes" audio_beos="no" +x11grab="no" dv1394="yes" dc1394="no" network="yes" @@ -955,6 +958,8 @@ for opt do ;; --enable-avisynth) avisynth="yes"; ;; + --enable-x11grab) x11grab="yes"; + ;; --enable-dc1394) dc1394="yes" pkg_requires="$pkg_requires libraw1394" ;; @@ -1163,6 +1168,11 @@ EOF echo "FAAD test failed." fi fi + + if test "$x11grab" != "no"; then + echo "The X11 grabber is under GPL and --enable-gpl is not specified." + fail="yes" + fi fi if test "$fail" = "yes"; then @@ -1661,6 +1671,7 @@ struct v4l2_buffer dummy1; EOF # Deal with the x11 frame grabber +enabled x11grab && enabled gpl && enabled x11_grab_device_demuxer && check_header X11/Xlib.h && diff --git a/libavformat/Makefile b/libavformat/Makefile index c76f902701..d9c9644ade 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -123,12 +123,15 @@ OBJS-$(CONFIG_WC3_DEMUXER) += wc3movie.o OBJS-$(CONFIG_WSAUD_DEMUXER) += westwood.o OBJS-$(CONFIG_WSVQA_DEMUXER) += westwood.o OBJS-$(CONFIG_WV_DEMUXER) += wv.o -OBJS-$(CONFIG_X11_GRAB_DEVICE_DEMUXER) += x11grab.o OBJS-$(CONFIG_YUV4MPEGPIPE_MUXER) += yuv4mpeg.o OBJS-$(CONFIG_YUV4MPEGPIPE_DEMUXER) += yuv4mpeg.o OBJS+= framehook.o +ifeq ($(CONFIG_X11GRAB),yes) +OBJS-$(CONFIG_X11_GRAB_DEVICE_DEMUXER) += x11grab.o +endif + ifeq ($(CONFIG_VIDEO4LINUX),yes) OBJS-$(CONFIG_VIDEO_GRAB_DEVICE_DEMUXER) += grab.o endif |