diff options
| author | Kyle <kshawkeye@gmail.com> | 2012-05-24 13:59:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-24 14:15:10 +0200 |
| commit | 02cc66dd78d929690df9f5db5ba6c0c825bdc267 (patch) | |
| tree | 943ced9edc890ea3cde765dc9aa60bd069c3e634 /libavdevice/Makefile | |
| parent | 2f6c5894f476c74551071259e79a11ec88513cf9 (diff) | |
| download | ffmpeg-02cc66dd78d929690df9f5db5ba6c0c825bdc267.tar.gz | |
dshow: rename dshow.h to avoid conflict with system header of equal name
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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 94da355c0d..720d96ad3b 100644 --- a/libavdevice/Makefile +++ b/libavdevice/Makefile @@ -38,7 +38,7 @@ OBJS-$(CONFIG_X11_GRAB_DEVICE_INDEV) += x11grab.o OBJS-$(CONFIG_LIBCDIO_INDEV) += libcdio.o OBJS-$(CONFIG_LIBDC1394_INDEV) += libdc1394.o -SKIPHEADERS-$(CONFIG_DSHOW_INDEV) += dshow.h +SKIPHEADERS-$(CONFIG_DSHOW_INDEV) += dshow_capture.h SKIPHEADERS-$(HAVE_ALSA_ASOUNDLIB_H) += alsa-audio.h SKIPHEADERS-$(HAVE_SNDIO_H) += sndio_common.h |