ffmpeg | branch: master | Clément Bœsch <u...@pkh.me> | Wed Mar 15 22:17:29 2017 +0100| [f6d61eb6f95aaf3a529397f205dd61d5dc47bce0] | committer: Clément Bœsch
Merge commit '5ed4644d6de7f6112431dc2d9a5cfe9a0a75a688' * commit '5ed4644d6de7f6112431dc2d9a5cfe9a0a75a688': x11grab: Rename internal component to "xcbgrab" Merged-by: Clément Bœsch <u...@pkh.me> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f6d61eb6f95aaf3a529397f205dd61d5dc47bce0 --- configure | 2 +- libavdevice/Makefile | 2 +- libavdevice/alldevices.c | 2 +- libavdevice/avdevice.h | 2 +- libavdevice/xcbgrab.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 488e803..e72ee29 100755 --- a/configure +++ b/configure @@ -3031,7 +3031,7 @@ v4l2_indev_deps_any="linux_videodev2_h sys_videoio_h" v4l2_outdev_deps_any="linux_videodev2_h sys_videoio_h" vfwcap_indev_deps="capCreateCaptureWindow vfwcap_defines" vfwcap_indev_extralibs="-lavicap32" -x11grab_xcb_indev_deps="libxcb" +xcbgrab_indev_deps="libxcb" xv_outdev_deps="X11_extensions_Xvlib_h XvGetPortAttribute" xv_outdev_extralibs="-lXv -lX11 -lXext" diff --git a/libavdevice/Makefile b/libavdevice/Makefile index 90ebc95..78c42e6 100644 --- a/libavdevice/Makefile +++ b/libavdevice/Makefile @@ -47,7 +47,7 @@ OBJS-$(CONFIG_V4L2_INDEV) += v4l2.o v4l2-common.o timefilter.o OBJS-$(CONFIG_V4L2_OUTDEV) += v4l2enc.o v4l2-common.o OBJS-$(CONFIG_V4L_INDEV) += v4l.o OBJS-$(CONFIG_VFWCAP_INDEV) += vfwcap.o -OBJS-$(CONFIG_X11GRAB_XCB_INDEV) += xcbgrab.o +OBJS-$(CONFIG_XCBGRAB_INDEV) += xcbgrab.o OBJS-$(CONFIG_XV_OUTDEV) += xv.o # external libraries diff --git a/libavdevice/alldevices.c b/libavdevice/alldevices.c index f8f31ed..280a260 100644 --- a/libavdevice/alldevices.c +++ b/libavdevice/alldevices.c @@ -63,7 +63,7 @@ static void register_all(void) REGISTER_INOUTDEV(V4L2, v4l2); // REGISTER_INDEV (V4L, v4l REGISTER_INDEV (VFWCAP, vfwcap); - REGISTER_INDEV (X11GRAB_XCB, x11grab_xcb); + REGISTER_INDEV (XCBGRAB, xcbgrab); REGISTER_OUTDEV (XV, xv); /* external libraries */ diff --git a/libavdevice/avdevice.h b/libavdevice/avdevice.h index 4315768..ee94624 100644 --- a/libavdevice/avdevice.h +++ b/libavdevice/avdevice.h @@ -37,7 +37,7 @@ * (de)muxers in libavdevice are of the AVFMT_NOFILE type (they use their own * I/O functions). The filename passed to avformat_open_input() often does not * refer to an actually existing file, but has some special device-specific - * meaning - e.g. for x11grab_xcb it is the display name. + * meaning - e.g. for xcbgrab it is the display name. * * To use libavdevice, simply call avdevice_register_all() to register all * compiled muxers and demuxers. They all use standard libavformat API. diff --git a/libavdevice/xcbgrab.c b/libavdevice/xcbgrab.c index 702e66c..2068cd3 100644 --- a/libavdevice/xcbgrab.c +++ b/libavdevice/xcbgrab.c @@ -690,7 +690,7 @@ static av_cold int xcbgrab_read_header(AVFormatContext *s) return 0; } -AVInputFormat ff_x11grab_xcb_demuxer = { +AVInputFormat ff_xcbgrab_demuxer = { .name = "x11grab", .long_name = NULL_IF_CONFIG_SMALL("X11 screen capture, using XCB"), .priv_data_size = sizeof(XCBGrabContext), ====================================================================== diff --cc configure index 488e803,66da1e4..e72ee29 --- a/configure +++ b/configure @@@ -3020,24 -2362,14 +3020,24 @@@ opengl_outdev_deps="opengl oss_indev_deps_any="soundcard_h sys_soundcard_h" oss_outdev_deps_any="soundcard_h sys_soundcard_h" pulse_indev_deps="libpulse" +pulse_outdev_deps="libpulse" +qtkit_indev_extralibs="-framework QTKit -framework Foundation -framework QuartzCore" +qtkit_indev_select="qtkit" +sdl2_outdev_deps="sdl2" sndio_indev_deps="sndio_h" sndio_outdev_deps="sndio_h" +v4l_indev_deps="linux_videodev_h" v4l2_indev_deps_any="linux_videodev2_h sys_videoio_h" +v4l2_outdev_deps_any="linux_videodev2_h sys_videoio_h" vfwcap_indev_deps="capCreateCaptureWindow vfwcap_defines" vfwcap_indev_extralibs="-lavicap32" - x11grab_xcb_indev_deps="libxcb" + xcbgrab_indev_deps="libxcb" +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="gcrypt gmp openssl" ffrtmpcrypt_protocol_select="tcp_protocol" diff --cc libavdevice/Makefile index 90ebc95,5bb1d3f..78c42e6 --- a/libavdevice/Makefile +++ b/libavdevice/Makefile @@@ -12,43 -9,21 +12,43 @@@ OBJS = alldevices. OBJS-$(HAVE_LIBC_MSVCRT) += file_open.o # input/output devices -OBJS-$(CONFIG_ALSA_INDEV) += alsa_dec.o alsa.o +OBJS-$(CONFIG_ALSA_INDEV) += alsa_dec.o alsa.o timefilter.o OBJS-$(CONFIG_ALSA_OUTDEV) += alsa_enc.o alsa.o -OBJS-$(CONFIG_AVFOUNDATION_INDEV) += avfoundation_dec.o +OBJS-$(CONFIG_AVFOUNDATION_INDEV) += avfoundation.o OBJS-$(CONFIG_BKTR_INDEV) += bktr.o +OBJS-$(CONFIG_CACA_OUTDEV) += caca.o +OBJS-$(CONFIG_DECKLINK_OUTDEV) += decklink_enc.o decklink_enc_c.o decklink_common.o +OBJS-$(CONFIG_DECKLINK_INDEV) += decklink_dec.o decklink_dec_c.o decklink_common.o +OBJS-$(CONFIG_DSHOW_INDEV) += dshow_crossbar.o dshow.o dshow_enummediatypes.o \ + dshow_enumpins.o dshow_filter.o \ + dshow_pin.o dshow_common.o OBJS-$(CONFIG_DV1394_INDEV) += dv1394.o -OBJS-$(CONFIG_FBDEV_INDEV) += fbdev.o +OBJS-$(CONFIG_FBDEV_INDEV) += fbdev_dec.o \ + fbdev_common.o +OBJS-$(CONFIG_FBDEV_OUTDEV) += fbdev_enc.o \ + fbdev_common.o +OBJS-$(CONFIG_GDIGRAB_INDEV) += gdigrab.o +OBJS-$(CONFIG_IEC61883_INDEV) += iec61883.o OBJS-$(CONFIG_JACK_INDEV) += jack.o timefilter.o +OBJS-$(CONFIG_LAVFI_INDEV) += lavfi.o +OBJS-$(CONFIG_OPENAL_INDEV) += openal-dec.o +OBJS-$(CONFIG_OPENGL_OUTDEV) += opengl_enc.o OBJS-$(CONFIG_OSS_INDEV) += oss_dec.o oss.o OBJS-$(CONFIG_OSS_OUTDEV) += oss_enc.o oss.o -OBJS-$(CONFIG_PULSE_INDEV) += pulse.o +OBJS-$(CONFIG_PULSE_INDEV) += pulse_audio_dec.o \ + pulse_audio_common.o timefilter.o +OBJS-$(CONFIG_PULSE_OUTDEV) += pulse_audio_enc.o \ + pulse_audio_common.o +OBJS-$(CONFIG_QTKIT_INDEV) += qtkit.o +OBJS-$(CONFIG_SDL2_OUTDEV) += sdl2.o OBJS-$(CONFIG_SNDIO_INDEV) += sndio_dec.o sndio.o OBJS-$(CONFIG_SNDIO_OUTDEV) += sndio_enc.o sndio.o -OBJS-$(CONFIG_V4L2_INDEV) += v4l2.o +OBJS-$(CONFIG_V4L2_INDEV) += v4l2.o v4l2-common.o timefilter.o +OBJS-$(CONFIG_V4L2_OUTDEV) += v4l2enc.o v4l2-common.o +OBJS-$(CONFIG_V4L_INDEV) += v4l.o OBJS-$(CONFIG_VFWCAP_INDEV) += vfwcap.o - OBJS-$(CONFIG_X11GRAB_XCB_INDEV) += xcbgrab.o + OBJS-$(CONFIG_XCBGRAB_INDEV) += xcbgrab.o +OBJS-$(CONFIG_XV_OUTDEV) += xv.o # external libraries OBJS-$(CONFIG_LIBCDIO_INDEV) += libcdio.o diff --cc libavdevice/alldevices.c index f8f31ed,cdbca4c..280a260 --- a/libavdevice/alldevices.c +++ b/libavdevice/alldevices.c @@@ -44,27 -50,15 +44,27 @@@ static void register_all(void REGISTER_INOUTDEV(ALSA, alsa); REGISTER_INDEV (AVFOUNDATION, avfoundation); REGISTER_INDEV (BKTR, bktr); + REGISTER_OUTDEV (CACA, caca); + REGISTER_INOUTDEV(DECKLINK, decklink); + REGISTER_INDEV (DSHOW, dshow); REGISTER_INDEV (DV1394, dv1394); - REGISTER_INDEV (FBDEV, fbdev); + REGISTER_INOUTDEV(FBDEV, fbdev); + REGISTER_INDEV (GDIGRAB, gdigrab); + REGISTER_INDEV (IEC61883, iec61883); REGISTER_INDEV (JACK, jack); + REGISTER_INDEV (LAVFI, lavfi); + REGISTER_INDEV (OPENAL, openal); + REGISTER_OUTDEV (OPENGL, opengl); REGISTER_INOUTDEV(OSS, oss); - REGISTER_INDEV (PULSE, pulse); + REGISTER_INOUTDEV(PULSE, pulse); + REGISTER_INDEV (QTKIT, qtkit); + REGISTER_OUTDEV (SDL2, sdl2); REGISTER_INOUTDEV(SNDIO, sndio); - REGISTER_INDEV (V4L2, v4l2); + REGISTER_INOUTDEV(V4L2, v4l2); +// REGISTER_INDEV (V4L, v4l REGISTER_INDEV (VFWCAP, vfwcap); - REGISTER_INDEV (X11GRAB_XCB, x11grab_xcb); + REGISTER_INDEV (XCBGRAB, xcbgrab); + REGISTER_OUTDEV (XV, xv); /* external libraries */ REGISTER_INDEV (LIBCDIO, libcdio); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
