From 4a13f7844dae0da0168799a7bf69b6ad1b5b58ad Mon Sep 17 00:00:00 2001 From: Rodrigo Braz Monteiro Date: Fri, 24 Feb 2006 08:56:12 +0000 Subject: [PATCH] Originally committed to SVN as r149. --- core/options.cpp | 2 +- core/video_provider.cpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/core/options.cpp b/core/options.cpp index ed644d827..f938df1f9 100644 --- a/core/options.cpp +++ b/core/options.cpp @@ -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); diff --git a/core/video_provider.cpp b/core/video_provider.cpp index 524de60b9..fc87d536c 100644 --- a/core/video_provider.cpp +++ b/core/video_provider.cpp @@ -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); }