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 /libavformat | |
| 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
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
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 |