Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-07-23 16:08:07 +02:00
Code Issues Releases Wiki Activity

Fix incorrect index usage which wasn't evident until a

Browse Source 
library was used that didn't contain M4A support.
This commit is contained in:
lllucius 2011-04-04 22:08:53 +00:00
parent ca141984d7
commit 1ec0141909
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/export/ExportFFmpeg.cpp
View File

@ -95,7 +95,7 @@ public:
bool CheckFileName(wxFileName &filename, int format = 0); bool CheckFileName(wxFileName &filename, int format = 0);
/// Format intialization /// Format intialization
bool Init(const char *shortname, AudacityProject *project, Tags *metadata); bool Init(const char *shortname, AudacityProject *project, Tags *metadata, int subformat);
/// Codec intialization /// Codec intialization
bool InitCodecs(AudacityProject *project); bool InitCodecs(AudacityProject *project);
@ -246,7 +246,7 @@ bool ExportFFmpeg::CheckFileName(wxFileName &filename, int format)
return result; return result;
} }
bool ExportFFmpeg::Init(const char *shortname, AudacityProject *project, Tags *metadata) bool ExportFFmpeg::Init(const char *shortname, AudacityProject *project, Tags *metadata, int subformat)
{ {
int err; int err;
//FFmpegLibsInst->LoadLibs(NULL,true); //Loaded at startup or from Prefs now //FFmpegLibsInst->LoadLibs(NULL,true); //Loaded at startup or from Prefs now
@ -317,7 +317,7 @@ bool ExportFFmpeg::Init(const char *shortname, AudacityProject *project, Tags *m
// Add metadata BEFORE writing the header. // Add metadata BEFORE writing the header.
// At the moment that works with ffmpeg-git and ffmpeg-0.5 for MP4. // At the moment that works with ffmpeg-git and ffmpeg-0.5 for MP4.
if (GetCanMetaData(mSubFormat)) if (GetCanMetaData(subformat))
{ {
mSupportsUTF8 = ExportFFmpegOptions::fmts[mSubFormat].canutf8; mSupportsUTF8 = ExportFFmpegOptions::fmts[mSubFormat].canutf8;
AddTags(metadata); AddTags(metadata);
@ -698,7 +698,7 @@ int ExportFFmpeg::Export(AudacityProject *project,
wxString shortname(ExportFFmpegOptions::fmts[mSubFormat].shortname); wxString shortname(ExportFFmpegOptions::fmts[mSubFormat].shortname);
if (mSubFormat == FMT_OTHER) if (mSubFormat == FMT_OTHER)
shortname = gPrefs->Read(wxT("/FileFormats/FFmpegFormat"),wxT("matroska")); shortname = gPrefs->Read(wxT("/FileFormats/FFmpegFormat"),wxT("matroska"));
ret = Init(shortname.mb_str(),project, metadata); ret = Init(shortname.mb_str(),project, metadata, subformat);
if (!ret) return false; if (!ret) return false;