diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2012-05-10 14:16:02 +0400 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2012-05-10 14:16:02 +0400 |
| commit | a2c67d6a3ac164adcf032584d28c780481050441 (patch) | |
| tree | 24473ae3d633acd0ec611d4f9248e40cfbc13b39 /src/filters/transform/Mpeg2DecFilter | |
| parent | 4507b34bba3394ae3cf019b65b4245046f1f90c6 (diff) | |
remove include/stdint.h since VS2010 comes with its own stdint.h, but work around warning C4005: 'XXXX' : macro redefinition. This workaround should be removed when it's fixed in MSVC.
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@4668 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/transform/Mpeg2DecFilter')
| -rw-r--r-- | src/filters/transform/Mpeg2DecFilter/libmpeg2.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/filters/transform/Mpeg2DecFilter/libmpeg2.h b/src/filters/transform/Mpeg2DecFilter/libmpeg2.h index ee64ca0c4..78dbe3ea5 100644 --- a/src/filters/transform/Mpeg2DecFilter/libmpeg2.h +++ b/src/filters/transform/Mpeg2DecFilter/libmpeg2.h @@ -22,7 +22,12 @@ #pragma once
+// TODO: remove this when it's fixed in MSVC
+// Work around warning C4005: 'XXXX' : macro redefinition
+#pragma warning(push)
+#pragma warning(disable: 4005)
#include <stdint.h>
+#pragma warning(pop)
#define MPEG2_VERSION(a,b,c) (((a)<<16)|((b)<<8)|(c))
#define MPEG2_RELEASE MPEG2_VERSION (0, 3, 2) /* 0.3.2 */
|