dshow: rename dshow.h to avoid conflict with system header of equal name
authorKyle <kshawkeye@gmail.com>
Thu, 24 May 2012 11:59:33 +0000 (13:59 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 24 May 2012 12:15:10 +0000 (14:15 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavdevice/Makefile
libavdevice/dshow.c
libavdevice/dshow_capture.h [moved from libavdevice/dshow.h with 100% similarity]
libavdevice/dshow_common.c
libavdevice/dshow_enummediatypes.c
libavdevice/dshow_enumpins.c
libavdevice/dshow_filter.c
libavdevice/dshow_pin.c

index 94da355..720d96a 100644 (file)
@@ -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
 
index 21e275d..2a7cdd1 100644 (file)
@@ -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;
index 8fe2f77..f7f0dfb 100644 (file)
@@ -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)
 {
index a700133..aaed58b 100644 (file)
@@ -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} })
index 02e967a..e5c11cb 100644 (file)
@@ -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} })
index 526e8b6..46d7eb0 100644 (file)
@@ -20,7 +20,7 @@
  */
 
 #define NO_DSHOW_STRSAFE
-#include "dshow.h"
+#include "dshow_capture.h"
 
 DECLARE_QUERYINTERFACE(libAVFilter,
     { {&IID_IUnknown,0}, {&IID_IBaseFilter,0} })
index d4463f6..3d9d468 100644 (file)
@@ -20,7 +20,7 @@
  */
 
 #define NO_DSHOW_STRSAFE
-#include "dshow.h"
+#include "dshow_capture.h"
 
 #include <stddef.h>
 #define imemoffset offsetof(libAVPin, imemvtbl)