ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Tue Sep 26 17:23:16 2017 -0300| [1985071e41f4df8fc693a564e25758676bba164a] | committer: James Almer
Merge commit 'a97563c889fefd81ad6b3758471434d8c2e2e550' * commit 'a97563c889fefd81ad6b3758471434d8c2e2e550': configure: Simplify libxcb check Merged-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1985071e41f4df8fc693a564e25758676bba164a --- configure | 1 + 1 file changed, 1 insertion(+) diff --git a/configure b/configure index b2d87bed5e..b07cef182c 100755 --- a/configure +++ b/configure @@ -3088,6 +3088,7 @@ v4l2_indev_deps_any="linux_videodev2_h sys_videoio_h" v4l2_outdev_deps_any="linux_videodev2_h sys_videoio_h" vfwcap_indev_deps="vfw32 vfwcap_defines" xcbgrab_indev_deps="libxcb" +xcbgrab_indev_suggest="libxcb_shm libxcb_shape libxcb_xfixes" xv_outdev_deps="X11_extensions_Xvlib_h XvGetPortAttribute" xv_outdev_extralibs="-lXv -lX11 -lXext" ====================================================================== diff --cc configure index b2d87bed5e,070edcae1e..b07cef182c --- a/configure +++ b/configure @@@ -3085,17 -2399,13 +3085,18 @@@ sdl2_outdev_deps="sdl2 sndio_indev_deps="sndio" sndio_outdev_deps="sndio" v4l2_indev_deps_any="linux_videodev2_h sys_videoio_h" +v4l2_outdev_deps_any="linux_videodev2_h sys_videoio_h" vfwcap_indev_deps="vfw32 vfwcap_defines" xcbgrab_indev_deps="libxcb" -xcbgrab_indev_suggest="libxcb_shm libxcb_xfixes" ++xcbgrab_indev_suggest="libxcb_shm libxcb_shape libxcb_xfixes" +xv_outdev_deps="X11_extensions_Xvlib_h XvGetPortAttribute" +xv_outdev_extralibs="-lXv -lX11 -lXext" # protocols +async_protocol_deps="threads" +bluray_protocol_deps="libbluray" ffrtmpcrypt_protocol_deps="!librtmp_protocol" -ffrtmpcrypt_protocol_deps_any="gmp openssl" +ffrtmpcrypt_protocol_deps_any="gcrypt gmp openssl" ffrtmpcrypt_protocol_select="tcp_protocol" ffrtmphttp_protocol_deps="!librtmp_protocol" ffrtmphttp_protocol_select="http_protocol" _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
