iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Originally committed to SVN as r149.

This commit is contained in:
Rodrigo Braz Monteiro 2006-02-24 08:56:12 +00:00
parent 360147d4ea
commit 4a13f7844d
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/options.cpp
View File

@ -153,7 +153,7 @@ void OptionsManager::LoadDefaults() {
SetBool(_T("Threaded Video"),false);
SetInt(_T("Avisynth MemoryMax"),64);
SetBool(_T("Allow Ancient Avisynth"),false);
SetBool(_T("Use ffmpeg"),false);
SetText(_T("Video Provider"),_T("Avisynth"));
SetText(_T("Video resizer"),_T("BilinearResize"));
SetInt(_T("Video Check Script Res"), 0);

5
core/video_provider.cpp
View File

@ -58,9 +58,12 @@ VideoProvider *VideoProvider::GetProvider(wxString video,wxString subtitles) {
// Initialize to null
VideoProvider *provider = NULL;
// Preffered provider
wxString preffered = Options.AsText(_T("Video provider")).Lower();
// See if it's OK to use LAVC
#ifdef USE_LAVC
if (Options.AsBool(_T("Use ffmpeg"))) {
if (preffered == _T("ffmpeg")) {
try {
provider = new LAVCVideoProvider(video,subtitles);
}