diff --git a/aegisub/dialog_about.cpp b/aegisub/dialog_about.cpp
index deb2c4909e8af939c3dbb0614a0299aaf9402fbb..01b22f28f55a1b1fcaa244bc8dd069b8052f1b81 100644
--- a/aegisub/dialog_about.cpp
+++ b/aegisub/dialog_about.cpp
@@ -79,6 +79,12 @@ AboutScreen::AboutScreen(wxWindow *parent)
 	libString += _T("    PortAudio - Copyright (c) 1999-2000 Ross Bencina, Phil Burk;\n");
 #endif
 #ifdef WITH_FFMPEG
+#define _FFMPEG_ANY
+#endif
+#ifdef WITH_FFMPEGSOURCE
+#define _FFMPEG_ANY
+#endif
+#ifdef _FFMPEG_ANY
 	libString += _T("    FFmpeg - Copyright (c) 2001 Fabrice Bellard,;\n");
 #endif
 #ifdef WITH_AVISYNTH
@@ -121,7 +127,7 @@ AboutScreen::AboutScreen(wxWindow *parent)
 	aboutString += _("Forum and wiki hosting by:");
 	aboutString += _T(" Sigurd Tao Lyngse.\n");
 	aboutString += _("SVN hosting by:");
-	aboutString += _T(" David Lamparter, BerliOS, Mentar.\n");
+	aboutString += _T(" DeathWolf, David Lamparter, BerliOS, Mentar.\n");
 	aboutString += _("Bug tracker hosting by:");
 	aboutString += _T(" Niels Martin Hansen.\n");
 	aboutString += translatorCredit;
diff --git a/aegisub/options.cpp b/aegisub/options.cpp
index 382800a779a984852110e18f690d0167c897df30..3da15b89dcf95b50f2e8b6ace24977f1143c43bf 100644
--- a/aegisub/options.cpp
+++ b/aegisub/options.cpp
@@ -161,7 +161,7 @@ void OptionsManager::LoadDefaults(bool onlyDefaults,bool doOverride) {
 	SetInt(_T("Avisynth MemoryMax"),64,1700);
 	SetBool(_T("Threaded Video"),false,1700);
 	#ifdef __WINDOWS__
-	SetText(_T("Video Provider"),_T("Avisynth"),1700);
+	SetText(_T("Video Provider"),_T("ffmpegsource"),2416);
 	#else
 	SetText(_T("Video Provider"),_T("FFMPEG"),1945);
 	#endif
@@ -198,7 +198,7 @@ void OptionsManager::LoadDefaults(bool onlyDefaults,bool doOverride) {
 	SetInt(_T("Audio Cache"),1,1700);
 	#if defined(__WINDOWS__)
 	SetText(_T("Audio Player"),_T("DirectSound"),1945);
-	SetText(_T("Audio Provider"),_T("avisynth"),1700);
+	SetText(_T("Audio Provider"),_T("ffmpegsource"),2416);
 	#elif defined(__APPLE__)
 	SetText(_T("Audio Player"), _T("openal"));
 	SetText(_T("Audio Provider"),_T("FFMPEG"),1945);