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 | |
| 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')
| -rw-r--r-- | libavdevice/Makefile | 2 | ||||
| -rw-r--r-- | libavdevice/dshow.c | 2 | ||||
| -rw-r--r-- | libavdevice/dshow_capture.h (renamed from libavdevice/dshow.h) | 0 | ||||
| -rw-r--r-- | libavdevice/dshow_common.c | 2 | ||||
| -rw-r--r-- | libavdevice/dshow_enummediatypes.c | 2 | ||||
| -rw-r--r-- | libavdevice/dshow_enumpins.c | 2 | ||||
| -rw-r--r-- | libavdevice/dshow_filter.c | 2 | ||||
| -rw-r--r-- | libavdevice/dshow_pin.c | 2 |
8 files changed, 7 insertions, 7 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 diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c index 21e275dd50..2a7cdd1aa6 100644 --- a/libavdevice/dshow.c +++ b/libavdevice/dshow.c @@ -23,7 +23,7 @@ #include "libavutil/opt.h" #include "libavformat/internal.h" #include "avdevice.h" -#include "dshow.h" +#include "dshow_capture.h" struct dshow_ctx { const AVClass *class; diff --git a/libavdevice/dshow.h b/libavdevice/dshow_capture.h index a3f52318d6..a3f52318d6 100644 --- a/libavdevice/dshow.h +++ b/libavdevice/dshow_capture.h diff --git a/libavdevice/dshow_common.c b/libavdevice/dshow_common.c index 8fe2f77f31..f7f0dfbdbb 100644 --- a/libavdevice/dshow_common.c +++ b/libavdevice/dshow_common.c @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "dshow.h" +#include "dshow_capture.h" long ff_copy_dshow_media_type(AM_MEDIA_TYPE *dst, const AM_MEDIA_TYPE *src) { diff --git a/libavdevice/dshow_enummediatypes.c b/libavdevice/dshow_enummediatypes.c index a700133ba6..aaed58b449 100644 --- a/libavdevice/dshow_enummediatypes.c +++ b/libavdevice/dshow_enummediatypes.c @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "dshow.h" +#include "dshow_capture.h" DECLARE_QUERYINTERFACE(libAVEnumMediaTypes, { {&IID_IUnknown,0}, {&IID_IEnumPins,0} }) diff --git a/libavdevice/dshow_enumpins.c b/libavdevice/dshow_enumpins.c index 02e967ae63..e5c11cb54e 100644 --- a/libavdevice/dshow_enumpins.c +++ b/libavdevice/dshow_enumpins.c @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "dshow.h" +#include "dshow_capture.h" DECLARE_QUERYINTERFACE(libAVEnumPins, { {&IID_IUnknown,0}, {&IID_IEnumPins,0} }) diff --git a/libavdevice/dshow_filter.c b/libavdevice/dshow_filter.c index 526e8b6e68..46d7eb0a54 100644 --- a/libavdevice/dshow_filter.c +++ b/libavdevice/dshow_filter.c @@ -20,7 +20,7 @@ */ #define NO_DSHOW_STRSAFE -#include "dshow.h" +#include "dshow_capture.h" DECLARE_QUERYINTERFACE(libAVFilter, { {&IID_IUnknown,0}, {&IID_IBaseFilter,0} }) diff --git a/libavdevice/dshow_pin.c b/libavdevice/dshow_pin.c index d4463f6c90..3d9d4687c5 100644 --- a/libavdevice/dshow_pin.c +++ b/libavdevice/dshow_pin.c @@ -20,7 +20,7 @@ */ #define NO_DSHOW_STRSAFE -#include "dshow.h" +#include "dshow_capture.h" #include <stddef.h> #define imemoffset offsetof(libAVPin, imemvtbl) |