From 1ffa0a95a1d0f9ab1e98aefd63d33ab13e50f2bc Mon Sep 17 00:00:00 2001
From: Fredrik Mellbin <fredrik.mellbin@gmail.com>
Date: Wed, 3 Sep 2008 19:22:34 +0000
Subject: [PATCH] FFmpegSource2: add a missing fourcc & fix a matroska access
 violation

Originally committed to SVN as r2311.
---
 FFmpegSource2/ffvideosource.cpp | 1 -
 FFmpegSource2/ffvideosource.h   | 1 -
 FFmpegSource2/utils.cpp         | 1 +
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/FFmpegSource2/ffvideosource.cpp b/FFmpegSource2/ffvideosource.cpp
index 9995ae838..c8e333b79 100644
--- a/FFmpegSource2/ffvideosource.cpp
+++ b/FFmpegSource2/ffvideosource.cpp
@@ -451,7 +451,6 @@ MatroskaVideoSource::MatroskaVideoSource(const char *SourceFile, int Track,
 }
 
 MatroskaVideoSource::~MatroskaVideoSource() {
-	free(Buffer);
 	mkv_Close(MF);
 	fclose(MC.ST.fp);
 	if (CodecContext)
diff --git a/FFmpegSource2/ffvideosource.h b/FFmpegSource2/ffvideosource.h
index 6f07d3998..0fc9e3fd5 100644
--- a/FFmpegSource2/ffvideosource.h
+++ b/FFmpegSource2/ffvideosource.h
@@ -81,7 +81,6 @@ private:
     CompressedStream *CS;
 	MatroskaFile *MF;
 	char ErrorMessage[256];
-    uint8_t *Buffer;
 	MatroskaReaderContext MC;
 
 	int DecodeNextFrame(AVFrame *AFrame, int64_t *AFirstStartTime, char *ErrorMsg, unsigned MsgSize);
diff --git a/FFmpegSource2/utils.cpp b/FFmpegSource2/utils.cpp
index 3eb687a8a..ac18326da 100644
--- a/FFmpegSource2/utils.cpp
+++ b/FFmpegSource2/utils.cpp
@@ -208,6 +208,7 @@ CodecID MatroskaToFFCodecID(TrackInfo *TI) {
 			case MAKEFOURCC('D', 'I', 'V', 'X'):
 			case MAKEFOURCC('D', 'X', '5', '0'):
 			case MAKEFOURCC('M', 'P', '4', 'V'):
+			case MAKEFOURCC('m', 'p', '4', 'v'): // This one may be my fault
 			case MAKEFOURCC('3', 'I', 'V', 'X'):
 			case MAKEFOURCC('W', 'V', '1', 'F'):
 			case MAKEFOURCC('F', 'M', 'P', '4'):