From df3a25129e2f0201a2fc36bc09224a3738e5133b Mon Sep 17 00:00:00 2001
From: Rodrigo Braz Monteiro <zeratul@cellosoft.com>
Date: Wed, 10 Sep 2008 22:01:35 +0000
Subject: [PATCH] Fixed project and other stuff for ffmpegsource support.

Originally committed to SVN as r2341.
---
 aegisub/setup.cpp                          |   7 +++++++
 aegisub/video_provider_ffmpegsource.cpp    |   4 ++--
 aegisub/video_provider_ffmpegsource.h      |   2 +-
 assdraw/assdraw_2008.vcproj                |   2 +-
 build/aegisub_vs2008/aegisub_vs2008.vcproj |   8 ++++++++
 lib/ffmpegsource2.lib                      | Bin 0 -> 7238 bytes
 6 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 lib/ffmpegsource2.lib

diff --git a/aegisub/setup.cpp b/aegisub/setup.cpp
index 483ec6bad..e87225661 100644
--- a/aegisub/setup.cpp
+++ b/aegisub/setup.cpp
@@ -123,6 +123,13 @@
 #pragma comment(lib, "opengl32.lib")
 
 
+////////////////
+// FFMpegSource
+#ifdef WITH_FFMPEGSOURCE
+#pragma comment(lib, "ffmpegsource2.lib")
+#endif
+
+
 //////////////
 // DirectShow
 #ifdef WITH_DIRECTSHOW
diff --git a/aegisub/video_provider_ffmpegsource.cpp b/aegisub/video_provider_ffmpegsource.cpp
index 24064541f..bede4afb8 100644
--- a/aegisub/video_provider_ffmpegsource.cpp
+++ b/aegisub/video_provider_ffmpegsource.cpp
@@ -38,7 +38,7 @@
 ///////////
 // Headers
 #include "video_provider_ffmpegsource.h"
-#include <ffms.h>
+#include "../FFmpegSource2/ffms.h"
 #include "video_context.h"
 #include "options.h"
 
@@ -230,7 +230,7 @@ const AegiVideoFrame FFmpegSourceVideoProvider::GetFrame(int _n, int FormatType)
 
 	// choose output format
 	if (FormatType & FORMAT_RGB32) {
-		DstFormat		= FFMS_PIX_FMT_RGB32; // FIXME: should be RGB32
+		DstFormat		= FFMS_PIX_FMT_RGB32;
 		DstFrame.format	= FORMAT_RGB32;
 	} else if (FormatType & FORMAT_RGB24) {
 		DstFormat		= FFMS_PIX_FMT_RGB24;
diff --git a/aegisub/video_provider_ffmpegsource.h b/aegisub/video_provider_ffmpegsource.h
index 4b5dd9d5e..452b196fe 100644
--- a/aegisub/video_provider_ffmpegsource.h
+++ b/aegisub/video_provider_ffmpegsource.h
@@ -42,7 +42,7 @@
 #include "dialog_progress.h"
 #include "vfr.h"
 #include <vector>
-#include <ffms.h>
+#include "../FFmpegSource2/ffms.h"
 
 
 
diff --git a/assdraw/assdraw_2008.vcproj b/assdraw/assdraw_2008.vcproj
index aa28473c8..9f5c5083f 100644
--- a/assdraw/assdraw_2008.vcproj
+++ b/assdraw/assdraw_2008.vcproj
@@ -199,7 +199,7 @@
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="0"
 			/>
 			<Tool
diff --git a/build/aegisub_vs2008/aegisub_vs2008.vcproj b/build/aegisub_vs2008/aegisub_vs2008.vcproj
index afaf94482..29b482318 100644
--- a/build/aegisub_vs2008/aegisub_vs2008.vcproj
+++ b/build/aegisub_vs2008/aegisub_vs2008.vcproj
@@ -1644,6 +1644,14 @@
 				RelativePath="..\..\aegisub\video_provider_dummy.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\aegisub\video_provider_ffmpegsource.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\aegisub\video_provider_ffmpegsource.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\aegisub\video_provider_lavc.cpp"
 				>
diff --git a/lib/ffmpegsource2.lib b/lib/ffmpegsource2.lib
new file mode 100644
index 0000000000000000000000000000000000000000..89023a32beb95ccc206a2474fdb3434b88737019
GIT binary patch
literal 7238
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
Yybjy)ic{tr>uW+CQ&E+F6zItR0gvnen*aa+

literal 0
HcmV?d00001