forked from mia/Aegisub
Fixed project and other stuff for ffmpegsource support.
Originally committed to SVN as r2341.
This commit is contained in:
parent
0026ba38ec
commit
df3a25129e
|
@ -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
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -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"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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
BIN
lib/ffmpegsource2.lib
Normal file
Binary file not shown.
Loading…
Reference in a new issue