Fixed project and other stuff for ffmpegsource support.

Originally committed to SVN as r2341.

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

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;

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"
 
 
 

assdraw/assdraw_2008.vcproj

@@ -199,7 +199,7 @@
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="0"
 			/>
 			<Tool

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"
 				>