Originally committed to SVN as r149.
This commit is contained in:
parent
360147d4ea
commit
4a13f7844d
2 changed files with 5 additions and 2 deletions
|
@ -153,7 +153,7 @@ void OptionsManager::LoadDefaults() {
|
||||||
SetBool(_T("Threaded Video"),false);
|
SetBool(_T("Threaded Video"),false);
|
||||||
SetInt(_T("Avisynth MemoryMax"),64);
|
SetInt(_T("Avisynth MemoryMax"),64);
|
||||||
SetBool(_T("Allow Ancient Avisynth"),false);
|
SetBool(_T("Allow Ancient Avisynth"),false);
|
||||||
SetBool(_T("Use ffmpeg"),false);
|
SetText(_T("Video Provider"),_T("Avisynth"));
|
||||||
|
|
||||||
SetText(_T("Video resizer"),_T("BilinearResize"));
|
SetText(_T("Video resizer"),_T("BilinearResize"));
|
||||||
SetInt(_T("Video Check Script Res"), 0);
|
SetInt(_T("Video Check Script Res"), 0);
|
||||||
|
|
|
@ -58,9 +58,12 @@ VideoProvider *VideoProvider::GetProvider(wxString video,wxString subtitles) {
|
||||||
// Initialize to null
|
// Initialize to null
|
||||||
VideoProvider *provider = NULL;
|
VideoProvider *provider = NULL;
|
||||||
|
|
||||||
|
// Preffered provider
|
||||||
|
wxString preffered = Options.AsText(_T("Video provider")).Lower();
|
||||||
|
|
||||||
// See if it's OK to use LAVC
|
// See if it's OK to use LAVC
|
||||||
#ifdef USE_LAVC
|
#ifdef USE_LAVC
|
||||||
if (Options.AsBool(_T("Use ffmpeg"))) {
|
if (preffered == _T("ffmpeg")) {
|
||||||
try {
|
try {
|
||||||
provider = new LAVCVideoProvider(video,subtitles);
|
provider = new LAVCVideoProvider(video,subtitles);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue