From 453f3ad816b5d3018eef9a3df6d6bc4c3fbdfbe8 Mon Sep 17 00:00:00 2001
From: Rodrigo Braz Monteiro <zeratul@cellosoft.com>
Date: Tue, 28 Oct 2008 04:24:45 +0000
Subject: [PATCH] Originally committed to SVN as r2427.
---
aegisub/video_provider_ffmpegsource.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/aegisub/video_provider_ffmpegsource.cpp b/aegisub/video_provider_ffmpegsource.cpp
index d09ae3a7b..8a1a86f9a 100644
--- a/aegisub/video_provider_ffmpegsource.cpp
+++ b/aegisub/video_provider_ffmpegsource.cpp
@@ -63,7 +63,7 @@ FFmpegSourceVideoProvider::FFmpegSourceVideoProvider(Aegisub::String filename, d
LoadVideo(filename, fps);
} catch (...) {
Close();
- //throw;
+ throw;
}
}
@@ -82,7 +82,7 @@ void FFmpegSourceVideoProvider::LoadVideo(Aegisub::String filename, double fps)
wxString FileNameWX(filename.c_str(), wxConvFile);
// generate a name for the cache file
- wxString CacheName = GetCacheFilename(filename);
+ wxString CacheName = wxString(GetCacheFilename(filename).c_str(),wxConvFile);
// try to read index
Index = FFMS_ReadIndex(CacheName.char_str(), FFMSErrorMessage, MessageSize);
--
GitLab