Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRamiro Polla <ramiro.polla@gmail.com>2007-09-22 00:01:43 +0400
committerRamiro Polla <ramiro.polla@gmail.com>2007-09-22 00:01:43 +0400
commit06eab4bae11775c49c8db7112bf62bc49bb78ee1 (patch)
treecb621df1f09c9279cc0677f14a6976184754e221 /configure
parent32bbb99d0a67d87c0128c110463a9bed1f8729e4 (diff)
Let the dependency checker decide about x11_grab_device_demuxer
Originally committed as revision 10542 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure6
1 files changed, 2 insertions, 4 deletions
diff --git a/configure b/configure
index 7ac385704e..496b4a77ca 100755
--- a/configure
+++ b/configure
@@ -794,7 +794,7 @@ rtsp_demuxer_deps="rtp_protocol rtp_muxer"
sdp_demuxer_deps="rtsp_demuxer"
v4l2_demuxer_deps="linux_videodev2_h"
v4l_demuxer_deps="linux_videodev_h"
-x11_grab_device_demuxer_deps="x11grab"
+x11_grab_device_demuxer_deps="x11grab XShmCreateImage"
x11_grab_device_demuxer_extralibs="-lX11 -lXext"
# protocols
@@ -1701,12 +1701,10 @@ check_header soundcard.h
# Deal with the x11 frame grabber
enabled x11grab &&
-enabled x11_grab_device_demuxer &&
check_header X11/Xlib.h &&
check_header X11/extensions/XShm.h &&
check_func XOpenDisplay -lX11 &&
-check_func XShmCreateImage -lX11 -lXext ||
-disable x11_grab_device_demuxer
+check_func XShmCreateImage -lX11 -lXext
enabled debug && add_cflags -g