From e1dfb76c1ecb435c512cd89d884d52a4122bdce2 Mon Sep 17 00:00:00 2001
From: Fredrik Mellbin <fredrik.mellbin@gmail.com>
Date: Wed, 31 Dec 2008 00:06:57 +0000
Subject: [PATCH] FFMS2 Add all required HAALITS ifdefs

Originally committed to SVN as r2572.
---
 FFmpegSource2/ffms.cpp          | 2 ++
 FFmpegSource2/ffvideosource.cpp | 4 ++++
 FFmpegSource2/ffvideosource.h   | 6 +++++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/FFmpegSource2/ffms.cpp b/FFmpegSource2/ffms.cpp
index 82de48fee..0d47f1523 100644
--- a/FFmpegSource2/ffms.cpp
+++ b/FFmpegSource2/ffms.cpp
@@ -59,7 +59,9 @@ FFMS_API(VideoBase *) FFMS_CreateVideoSource(const char *SourceFile, int Track,
 		switch (TrackIndices->Decoder) {
 			case 0: return new FFVideoSource(SourceFile, Track, TrackIndices, PP, Threads, SeekMode, ErrorMsg, MsgSize);
 			case 1: return new MatroskaVideoSource(SourceFile, Track, TrackIndices, PP, Threads, ErrorMsg, MsgSize);
+#ifdef HAALITS
 			case 2: return new HaaliTSVideoSource(SourceFile, Track, TrackIndices, PP, Threads, ErrorMsg, MsgSize);
+#endif
 			default: 
 				_snprintf(ErrorMsg, MsgSize, "Unsupported format");
 				return NULL;
diff --git a/FFmpegSource2/ffvideosource.cpp b/FFmpegSource2/ffvideosource.cpp
index af1bc8281..7968d4507 100644
--- a/FFmpegSource2/ffvideosource.cpp
+++ b/FFmpegSource2/ffvideosource.cpp
@@ -561,6 +561,8 @@ AVFrameLite *MatroskaVideoSource::GetFrame(int n, char *ErrorMsg, unsigned MsgSi
 	return OutputFrame(DecodeFrame);
 }
 
+#ifdef HAALITS
+
 void HaaliTSVideoSource::Free(bool CloseCodec) {
 	if (CloseCodec)
 		avcodec_close(CodecContext);
@@ -789,3 +791,5 @@ AVFrameLite *HaaliTSVideoSource::GetFrame(int n, char *ErrorMsg, unsigned MsgSiz
 	LastFrameNum = n;
 	return OutputFrame(DecodeFrame);
 }
+
+#endif // HAALITS
\ No newline at end of file
diff --git a/FFmpegSource2/ffvideosource.h b/FFmpegSource2/ffvideosource.h
index d27852533..a466aa305 100644
--- a/FFmpegSource2/ffvideosource.h
+++ b/FFmpegSource2/ffvideosource.h
@@ -33,7 +33,7 @@ extern "C" {
 #include "utils.h"
 #include "ffms.h"
 
-#ifdef _WIN32
+#ifdef HAALITS
 #	define _WIN32_DCOM
 #	include <windows.h>
 #	include <tchar.h>
@@ -101,6 +101,8 @@ public:
     AVFrameLite *GetFrame(int n, char *ErrorMsg, unsigned MsgSize);
 };
 
+#ifdef HAALITS
+
 class HaaliTSVideoSource : public VideoBase {
 private:
 	CComPtr<IMMContainer> pMMC;
@@ -113,4 +115,6 @@ public:
     AVFrameLite *GetFrame(int n, char *ErrorMsg, unsigned MsgSize);
 };
 
+#endif // HAALITS
+
 #endif