[FFmpeg-cvslog] dshow: rename dshow.h to avoid conflict with system header of equal name

[Kyle]

ffmpeg | branch: master | Kyle <kshawkeye at gmail.com> | Thu May 24 13:59:33 2012 +0200| [02cc66dd78d929690df9f5db5ba6c0c825bdc267] | committer: Michael Niedermayer

dshow: rename dshow.h to avoid conflict with system header of equal name

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=02cc66dd78d929690df9f5db5ba6c0c825bdc267
---

 libavdevice/Makefile                     |    2 +-
 libavdevice/dshow.c                      |    2 +-
 libavdevice/{dshow.h => dshow_capture.h} |    0
 libavdevice/dshow_common.c               |    2 +-
 libavdevice/dshow_enummediatypes.c       |    2 +-
 libavdevice/dshow_enumpins.c             |    2 +-
 libavdevice/dshow_filter.c               |    2 +-
 libavdevice/dshow_pin.c                  |    2 +-
 8 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libavdevice/Makefile b/libavdevice/Makefile
index 94da355..720d96a 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 21e275d..2a7cdd1 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
similarity index 100%
rename from libavdevice/dshow.h
rename to libavdevice/dshow_capture.h
diff --git a/libavdevice/dshow_common.c b/libavdevice/dshow_common.c
index 8fe2f77..f7f0dfb 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 a700133..aaed58b 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 02e967a..e5c11cb 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 526e8b6..46d7eb0 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 d4463f6..3d9d468 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)