diff options
| author | Alexander Strasser <eclipse7@gmx.net> | 2012-11-03 17:05:51 +0100 |
|---|---|---|
| committer | Alexander Strasser <eclipse7@gmx.net> | 2012-11-16 19:26:13 +0100 |
| commit | 7750c48d30405a7682e44b68ac46bd9b59200229 (patch) | |
| tree | dcac28544c164ded1f2e28a7da9abc710df3a850 | |
| parent | c2cbc80ae9e3f00e21235915a80f81a2aeb7db0a (diff) | |
| download | ffmpeg-7750c48d30405a7682e44b68ac46bd9b59200229.tar.gz | |
dshow: Use NO_DSHOW_STRSAFE for all dshow header inclusions
Move the NO_DSHOW_STRSAFE 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 found in the commit message of
revision 05ee0db1 where the #define was initially introduced.
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
| -rw-r--r-- | libavdevice/dshow_capture.h | 1 | ||||
| -rw-r--r-- | libavdevice/dshow_filter.c | 1 | ||||
| -rw-r--r-- | libavdevice/dshow_pin.c | 1 |
3 files changed, 1 insertions, 2 deletions
diff --git a/libavdevice/dshow_capture.h b/libavdevice/dshow_capture.h index e34f14fcc7..2446c7cd5f 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 46d7eb0a54..7360adcfcd 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 676877e903..4953642bb9 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> |