[FFmpeg-devel] [PATCH] dshow: Use NO_DSHOW_STRSAFE for all dshow header inclusions

[Alexander Strasser]

Move the NO_DSHOW_STRSAFE C macro definition in front of the dshow.h
system header inclusion.

This excludes the usage of the STRSAFE functions consistently.

Further background on this can be read in the commit message of
revision 05ee0db1 where the define was initially introduced.

Signed-off-by: Alexander Strasser <eclipse7 at gmx.net>
---
 libavdevice/dshow_capture.h | 1 +
 libavdevice/dshow_filter.c  | 1 -
 libavdevice/dshow_pin.c     | 1 -
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/libavdevice/dshow_capture.h b/libavdevice/dshow_capture.h
index e34f14f..2446c7c 100644
--- a/libavdevice/dshow_capture.h
+++ b/libavdevice/dshow_capture.h
@@ -28,6 +28,7 @@
 
 #define COBJMACROS
 #include <windows.h>
+#define NO_DSHOW_STRSAFE
 #include <dshow.h>
 #include <dvdmedia.h>
 
diff --git a/libavdevice/dshow_filter.c b/libavdevice/dshow_filter.c
index 46d7eb0..7360adc 100644
--- a/libavdevice/dshow_filter.c
+++ b/libavdevice/dshow_filter.c
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define NO_DSHOW_STRSAFE
 #include "dshow_capture.h"
 
 DECLARE_QUERYINTERFACE(libAVFilter,
diff --git a/libavdevice/dshow_pin.c b/libavdevice/dshow_pin.c
index 676877e..4953642 100644
--- a/libavdevice/dshow_pin.c
+++ b/libavdevice/dshow_pin.c
@@ -19,7 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define NO_DSHOW_STRSAFE
 #include "dshow_capture.h"
 
 #include <stddef.h>
-- 
1.7.10.2.552.gaa3bb87