1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-11 17:13:37 +02:00

Additional changes for bug #1112

See http://bugzilla.audacityteam.org/show_bug.cgi?id=1112#c7
This commit is contained in:
Leland Lucius
2015-08-26 12:15:02 -05:00
parent 6c73bab41e
commit 5c3ff022e6

View File

@@ -244,10 +244,15 @@ void ExportFFmpeg::Destroy()
bool ExportFFmpeg::CheckFileName(wxFileName & WXUNUSED(filename), int WXUNUSED(format))
{
bool result = true;
if (!CheckFFmpegPresence())
// Show "Locate FFmpeg" dialog
if (!CheckFFmpegPresence(true))
{
result = false;
FFmpegLibsInst->FindLibs(NULL);
FFmpegLibsInst->FreeLibs();
return LoadFFmpeg(true);
}
return result;
}
@@ -978,10 +983,6 @@ int ExportFFmpeg::AskResample(int bitrate, int rate, int lowrate, int highrate,
wxWindow *ExportFFmpeg::OptionsCreate(wxWindow *parent, int format)
{
if (!CheckFFmpegPresence(true)) {
return ExportPlugin::OptionsCreate(parent, format);
}
// subformat index may not correspond directly to fmts[] index, convert it
mSubFormat = AdjustFormatIndex(format);
if (mSubFormat == FMT_M4A)