summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorGuillaume Poirier <gpoirier@mplayerhq.hu>2006-12-13 08:45:36 +0000
committerGuillaume Poirier <gpoirier@mplayerhq.hu>2006-12-13 08:45:36 +0000
commitf58f4ce19d37cd754ffc577906b619a083b03191 (patch)
tree9891e418cc4c983cd16ada49819a31634abce399 /configure
parent83c547a4a14976ea2a5e51273a2ef372aca71044 (diff)
Original X11 device demuxer patch from Clemens Fruhwirth
- Build system integration is equivalent to RFC #6 patch - Same rule applies to ffmpeg.c/allformats.[c|h] - x11grab.c is from Clemens Fruhwirth except the x11 grab structure for libavformat registration is renamed to match build system integration. Originally committed as revision 7302 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure10
1 files changed, 10 insertions, 0 deletions
diff --git a/configure b/configure
index be4e574738..5899568448 100755
--- a/configure
+++ b/configure
@@ -1659,6 +1659,16 @@ int dummy = V4L2_PIX_FMT_YUV420;
struct v4l2_buffer dummy1;
EOF
+# Deal with the x11 frame grabber
+enabled gpl &&
+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 &&
+add_extralibs -lX11 -lXext ||
+disable x11_grab_device_demuxer
+
enabled debug && add_cflags -g
# add some useful compiler flags if supported