diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2013-05-06 15:47:18 +0400 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2013-05-18 18:49:06 +0400 |
| commit | 04711ba2eafe3c4e20235a9a03994ec64855d3dc (patch) | |
| tree | 8850cb96c260d9fa1e6d3a0eb79abe13bdf941f5 /src/filters/transform/MPCVideoDec | |
| parent | f57605e3199e52d5abac49725771b5b3c2c8eb90 (diff) | |
Be consistent with function's variables.
Diffstat (limited to 'src/filters/transform/MPCVideoDec')
| -rw-r--r-- | src/filters/transform/MPCVideoDec/MPCVideoDecFilter.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.h b/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.h index f8d6c82fd..a081fcbac 100644 --- a/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.h +++ b/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.h @@ -35,6 +35,13 @@ #include "H264RandomAccess.h"
#include <atlpath.h>
+// TODO: remove this when it's fixed in MSVC
+// Work around warning C4005: 'XXXX' : macro redefinition
+#pragma warning(disable: 4005)
+#include <stdint.h>
+#pragma warning(default: 4005)
+
+
#define MPCVideoDecName L"MPC Video Decoder"
#define MAX_BUFF_TIME 20
@@ -73,9 +80,9 @@ typedef struct { } BUFFER_TIME;
typedef struct {
- bool video_after_seek;
- __int32 kf_pts; ///< timestamp of next video keyframe
- __int64 kf_base; ///< timestamp of the prev. video keyframe
+ bool video_after_seek;
+ int kf_pts; ///< timestamp of next video keyframe
+ int64_t kf_base; ///< timestamp of the previous video keyframe
} RMDemuxContext;
class __declspec(uuid("008BAC12-FBAF-497b-9670-BC6F6FBAE2C4"))
|