Let the dependency checker decide about x11_grab_device_demuxer
Originally committed as revision 10542 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
32bbb99d0a
commit
06eab4bae1
6
configure
vendored
6
configure
vendored
@ -794,7 +794,7 @@ rtsp_demuxer_deps="rtp_protocol rtp_muxer"
|
|||||||
sdp_demuxer_deps="rtsp_demuxer"
|
sdp_demuxer_deps="rtsp_demuxer"
|
||||||
v4l2_demuxer_deps="linux_videodev2_h"
|
v4l2_demuxer_deps="linux_videodev2_h"
|
||||||
v4l_demuxer_deps="linux_videodev_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"
|
x11_grab_device_demuxer_extralibs="-lX11 -lXext"
|
||||||
|
|
||||||
# protocols
|
# protocols
|
||||||
@ -1701,12 +1701,10 @@ check_header soundcard.h
|
|||||||
|
|
||||||
# Deal with the x11 frame grabber
|
# Deal with the x11 frame grabber
|
||||||
enabled x11grab &&
|
enabled x11grab &&
|
||||||
enabled x11_grab_device_demuxer &&
|
|
||||||
check_header X11/Xlib.h &&
|
check_header X11/Xlib.h &&
|
||||||
check_header X11/extensions/XShm.h &&
|
check_header X11/extensions/XShm.h &&
|
||||||
check_func XOpenDisplay -lX11 &&
|
check_func XOpenDisplay -lX11 &&
|
||||||
check_func XShmCreateImage -lX11 -lXext ||
|
check_func XShmCreateImage -lX11 -lXext
|
||||||
disable x11_grab_device_demuxer
|
|
||||||
|
|
||||||
enabled debug && add_cflags -g
|
enabled debug && add_cflags -g
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user