Browse Source

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Kyle 12 years ago
parent
commit
02cc66dd78

+ 1 - 1
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
 

+ 1 - 1
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;

+ 0 - 0
libavdevice/dshow.h → libavdevice/dshow_capture.h


+ 1 - 1
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)
 {

+ 1 - 1
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} })

+ 1 - 1
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} })

+ 1 - 1
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} })

+ 1 - 1
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)