diff --git a/FFmpegSource2/ffvideosource.cpp b/FFmpegSource2/ffvideosource.cpp
index 23848827d..169d339be 100644
--- a/FFmpegSource2/ffvideosource.cpp
+++ b/FFmpegSource2/ffvideosource.cpp
@@ -447,7 +447,6 @@ MatroskaVideoSource::MatroskaVideoSource(const char *SourceFile, int Track,
 	FrameIndex *TrackIndices, const char *PP,
 	int Threads, char *ErrorMsg, unsigned MsgSize) {
 
-	unsigned int TrackMask = ~0;
 	AVCodec *Codec = NULL;
 	CodecContext = NULL;
 	TrackInfo *TI = NULL;
@@ -567,7 +566,7 @@ int MatroskaVideoSource::DecodeNextFrame(AVFrame *AFrame, int64_t *AFirstStartTi
 	int FrameFinished = 0;
 	*AFirstStartTime = -1;
 
-	uint64_t StartTime, EndTime, FilePos;
+	ulonglong StartTime, EndTime, FilePos;
 	unsigned int Track, FrameFlags, FrameSize;
 	
 	while (mkv_ReadFrame(MF, 0, &Track, &StartTime, &EndTime, &FilePos, &FrameSize, &FrameFlags) == 0) {
diff --git a/FFmpegSource2/indexing.cpp b/FFmpegSource2/indexing.cpp
index a2660f31a..957b1a889 100644
--- a/FFmpegSource2/indexing.cpp
+++ b/FFmpegSource2/indexing.cpp
@@ -202,7 +202,7 @@ static FrameIndex *MakeMatroskaIndex(const char *SourceFile, int AudioTrackMask,
 	for (unsigned int i = 0; i < mkv_GetNumTracks(MF); i++)
 		TrackIndices->push_back(FrameInfoVector(mkv_TruncFloat(mkv_GetTrackInfo(MF, i)->TimecodeScale), 1000000));
 
-	uint64_t StartTime, EndTime, FilePos;
+	ulonglong StartTime, EndTime, FilePos;
 	unsigned int Track, FrameFlags, FrameSize;
 
 	while (mkv_ReadFrame(MF, 0, &Track, &StartTime, &EndTime, &FilePos, &FrameSize, &FrameFlags) == 0) {