Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-05-03 17:19:43 +02:00
Code Issues Releases Wiki Activity

Fix bug #141 and correct monolithic test.

Browse Source
This commit is contained in:
lllucius 2011-03-06 20:30:10 +00:00
parent 1c0af1bc75
commit f88b7f67ab
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/FFmpeg.cpp
View File

@ -99,12 +99,15 @@ void FFmpegStartup()
bool enabled = false; bool enabled = false;
gPrefs->Read(wxT("/FFmpeg/Enabled"),&enabled); gPrefs->Read(wxT("/FFmpeg/Enabled"),&enabled);
// 'false' means that no errors should be shown whatsoever // 'false' means that no errors should be shown whatsoever
if (enabled && !LoadFFmpeg(false)) if (!LoadFFmpeg(false))
{ {
wxMessageBox(_("FFmpeg was configured in Preferences and successfully loaded before, \ if (enabled)
\nbut this time Audacity failed to load it at startup. \ {
\n\nYou may want to go back to Preferences > Libraries and re-configure it."), wxMessageBox(_("FFmpeg was configured in Preferences and successfully loaded before, \
_("FFmpeg startup failed")); \nbut this time Audacity failed to load it at startup. \
\n\nYou may want to go back to Preferences > Libraries and re-configure it."),
_("FFmpeg startup failed"));
}
} }
} }
@ -739,10 +742,9 @@ bool FFmpegLibs::InitLibs(wxString libpath_format, bool showerr)
wxFileName actual; wxFileName actual;
actual = FileNames::PathFromAddr(avformat->GetSymbol(wxT("avutil_version"))); actual = FileNames::PathFromAddr(avformat->GetSymbol(wxT("avutil_version")));
if (actual.GetPath().IsSameAs(name.GetPath())) { if (actual.GetFullPath().IsSameAs(name.GetFullPath())) {
actual = FileNames::PathFromAddr(avformat->GetSymbol(wxT("avcodec_version"))); actual = FileNames::PathFromAddr(avformat->GetSymbol(wxT("avcodec_version")));
if (actual.GetPath().IsSameAs(name.GetPath())) { if (actual.GetFullPath().IsSameAs(name.GetFullPath())) {
util = avformat; util = avformat;
codec = avformat; codec = avformat;
} }