From 574236875c40da5ea6b4715fb7ca0e25a8f4fa2a Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Wed, 25 Aug 2010 19:31:26 +0000 Subject: [PATCH] Fix assertion failure in 32-bit builds Originally committed to SVN as r4753. --- aegisub/src/ffmpegsource_common.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/aegisub/src/ffmpegsource_common.cpp b/aegisub/src/ffmpegsource_common.cpp index 2034e9e35..e4b474c69 100644 --- a/aegisub/src/ffmpegsource_common.cpp +++ b/aegisub/src/ffmpegsource_common.cpp @@ -39,7 +39,9 @@ #ifdef WITH_FFMPEGSOURCE #ifndef AGI_PRE +#include #include + #include #include // Keep this last so wxUSE_CHOICEDLG is set. #endif @@ -210,7 +212,7 @@ FFMS_IndexErrorHandling FFmpegSourceProvider::GetErrorHandlingMode() { return FFMS_IEH_STOP_TRACK; // questionable default? } - +#include /// @brief Generates an unique name for the ffms2 index file and prepares the cache folder if it doesn't exist /// @param filename The name of the source file /// @return Returns the generated filename. @@ -225,8 +227,8 @@ wxString FFmpegSourceProvider::GetCacheFilename(const wxString& _filename) wxFileName filename(_filename); - // Generate string to be hashed // - wxString toHash = wxString::Format(_T("%s %ld %ld"), filename.GetFullName(), len, filename.GetModificationTime().GetTicks()); + // Generate string to be hashed + wxString toHash = wxString::Format("%s %" PRId64 " %" PRId64, filename.GetFullName(), len, (int64_t)filename.GetModificationTime().GetTicks()); // Get the MD5 digest of the string