mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Fixed project and other stuff for ffmpegsource support.

Browse source 
Originally committed to SVN as r2341.
This commit is contained in:
Rodrigo Braz Monteiro 2008-09-10 22:01:35 +00:00
parent 0026ba38ec
commit df3a25129e
6 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
aegisub/setup.cpp
View file

@ -123,6 +123,13 @@
#pragma comment(lib, "opengl32.lib") #pragma comment(lib, "opengl32.lib")
////////////////
// FFMpegSource
#ifdef WITH_FFMPEGSOURCE
#pragma comment(lib, "ffmpegsource2.lib")
#endif
////////////// //////////////
// DirectShow // DirectShow
#ifdef WITH_DIRECTSHOW #ifdef WITH_DIRECTSHOW

4
aegisub/video_provider_ffmpegsource.cpp
View file

@ -38,7 +38,7 @@
/////////// ///////////
// Headers // Headers
#include "video_provider_ffmpegsource.h" #include "video_provider_ffmpegsource.h"
#include <ffms.h> #include "../FFmpegSource2/ffms.h"
#include "video_context.h" #include "video_context.h"
#include "options.h" #include "options.h"
@ -230,7 +230,7 @@ const AegiVideoFrame FFmpegSourceVideoProvider::GetFrame(int _n, int FormatType)
// choose output format // choose output format
if (FormatType & FORMAT_RGB32) { if (FormatType & FORMAT_RGB32) {
DstFormat = FFMS_PIX_FMT_RGB32; // FIXME: should be RGB32 DstFormat = FFMS_PIX_FMT_RGB32;
DstFrame.format = FORMAT_RGB32; DstFrame.format = FORMAT_RGB32;
} else if (FormatType & FORMAT_RGB24) { } else if (FormatType & FORMAT_RGB24) {
DstFormat = FFMS_PIX_FMT_RGB24; DstFormat = FFMS_PIX_FMT_RGB24;

2
aegisub/video_provider_ffmpegsource.h
View file

@ -42,7 +42,7 @@
#include "dialog_progress.h" #include "dialog_progress.h"
#include "vfr.h" #include "vfr.h"
#include <vector> #include <vector>
#include <ffms.h> #include "../FFmpegSource2/ffms.h"

2
assdraw/assdraw_2008.vcproj
View file

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

8
build/aegisub_vs2008/aegisub_vs2008.vcproj
View file

@ -1644,6 +1644,14 @@
RelativePath="..\..\aegisub\video_provider_dummy.h" RelativePath="..\..\aegisub\video_provider_dummy.h"
> >
</File> </File>
<File
RelativePath="..\..\aegisub\video_provider_ffmpegsource.cpp"
>
</File>
<File
RelativePath="..\..\aegisub\video_provider_ffmpegsource.h"
>
</File>
<File <File
RelativePath="..\..\aegisub\video_provider_lavc.cpp" RelativePath="..\..\aegisub\video_provider_lavc.cpp"
> >

BIN
lib/ffmpegsource2.lib Normal file
View file

Binary file not shown.