diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-15 22:17:29 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-15 22:19:56 +0100 |
| commit | f6d61eb6f95aaf3a529397f205dd61d5dc47bce0 (patch) | |
| tree | 72fcaac4e010ca7f15471c5ca5a4347da426c4d4 /libavdevice/Makefile | |
| parent | 4a9c5f6bc5a825f10b77f6ce084aa840d5c1d93e (diff) | |
| parent | 5ed4644d6de7f6112431dc2d9a5cfe9a0a75a688 (diff) | |
| download | ffmpeg-streaming-f6d61eb6f95aaf3a529397f205dd61d5dc47bce0.zip ffmpeg-streaming-f6d61eb6f95aaf3a529397f205dd61d5dc47bce0.tar.gz | |
Merge commit '5ed4644d6de7f6112431dc2d9a5cfe9a0a75a688'
* commit '5ed4644d6de7f6112431dc2d9a5cfe9a0a75a688':
x11grab: Rename internal component to "xcbgrab"
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavdevice/Makefile')
| -rw-r--r-- | libavdevice/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
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 |
