diff -ru ./ffmpeg-git/configure ./ffmpeg-git-copy/configure
--- ./ffmpeg-git/configure	2012-05-19 00:44:23.000000000 -0400
+++ ./ffmpeg-git-copy/configure	2012-05-23 13:08:34.000000000 -0400
@@ -3293,7 +3293,7 @@
 # w32api 3.12 had it defined wrong
 check_cpp_condition vfw.h "WM_CAP_DRIVER_CONNECT > WM_USER" && enable vfwcap_defines

-check_type "dshow.h" IBaseFilter
+check_type "dshow_capture.h" IBaseFilter

 # check for ioctl_meteor.h, ioctl_bt848.h and alternatives
 { check_header dev/bktr/ioctl_meteor.h &&
diff -ru ./ffmpeg-git/libavdevice/dshow.c ./ffmpeg-git-copy/libavdevice/dshow.c
--- ./ffmpeg-git/libavdevice/dshow.c	2012-02-06 20:47:56.000000000 -0500
+++ ./ffmpeg-git-copy/libavdevice/dshow.c	2012-05-23 13:06:30.000000000 -0400
@@ -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;
Only in ./ffmpeg-git-copy/libavdevice: dshow_capture.h
diff -ru ./ffmpeg-git/libavdevice/dshow_common.c ./ffmpeg-git-copy/libavdevice/dshow_common.c
--- ./ffmpeg-git/libavdevice/dshow_common.c	2011-12-22 02:05:52.000000000 -0500
+++ ./ffmpeg-git-copy/libavdevice/dshow_common.c	2012-05-23 13:08:07.000000000 -0400
@@ -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 -ru ./ffmpeg-git/libavdevice/dshow_enummediatypes.c ./ffmpeg-git-copy/libavdevice/dshow_enummediatypes.c
--- ./ffmpeg-git/libavdevice/dshow_enummediatypes.c	2011-12-22 02:05:52.000000000 -0500
+++ ./ffmpeg-git-copy/libavdevice/dshow_enummediatypes.c	2012-05-23 13:07:58.000000000 -0400
@@ -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 -ru ./ffmpeg-git/libavdevice/dshow_enumpins.c ./ffmpeg-git-copy/libavdevice/dshow_enumpins.c
--- ./ffmpeg-git/libavdevice/dshow_enumpins.c	2011-12-22 02:05:52.000000000 -0500
+++ ./ffmpeg-git-copy/libavdevice/dshow_enumpins.c	2012-05-23 13:07:50.000000000 -0400
@@ -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 -ru ./ffmpeg-git/libavdevice/dshow_filter.c ./ffmpeg-git-copy/libavdevice/dshow_filter.c
--- ./ffmpeg-git/libavdevice/dshow_filter.c	2012-02-21 20:34:24.000000000 -0500
+++ ./ffmpeg-git-copy/libavdevice/dshow_filter.c	2012-05-23 13:07:37.000000000 -0400
@@ -20,7 +20,7 @@
  */

 #define NO_DSHOW_STRSAFE
-#include "dshow.h"
+#include "dshow_capture.h"

 DECLARE_QUERYINTERFACE(libAVFilter,
     { {&IID_IUnknown,0}, {&IID_IBaseFilter,0} })
Only in ./ffmpeg-git/libavdevice: dshow.h
diff -ru ./ffmpeg-git/libavdevice/dshow_pin.c ./ffmpeg-git-copy/libavdevice/dshow_pin.c
--- ./ffmpeg-git/libavdevice/dshow_pin.c	2012-02-21 20:34:24.000000000 -0500
+++ ./ffmpeg-git-copy/libavdevice/dshow_pin.c	2012-05-23 13:05:48.000000000 -0400
@@ -20,7 +20,7 @@
  */

 #define NO_DSHOW_STRSAFE
-#include "dshow.h"
+#include "dshow_capture.h"

 #include <stddef.h>
 #define imemoffset offsetof(libAVPin, imemvtbl)
diff -ru ./ffmpeg-git/libavdevice/Makefile ./ffmpeg-git-copy/libavdevice/Makefile
--- ./ffmpeg-git/libavdevice/Makefile	2012-05-19 00:44:23.000000000 -0400
+++ ./ffmpeg-git-copy/libavdevice/Makefile	2012-05-23 13:05:22.000000000 -0400
@@ -38,7 +38,7 @@
 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