Update of /cvsroot/audacity/audacity-src/src/export
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv3096/src/export
Modified Files:
ExportFFmpeg.cpp ExportFFmpegDialogs.h
Log Message:
Apply metadata before writing the output file header (Note to self: AND KEEP IT
LIKE THIS!)
Disable WMA/ASF metadata support (produces files that are not playable with
native players)
Index: ExportFFmpegDialogs.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/export/ExportFFmpegDialogs.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- ExportFFmpegDialogs.h 31 Aug 2009 21:38:29 -0000 1.12
+++ ExportFFmpegDialogs.h 31 Dec 2009 09:16:13 -0000 1.13
@@ -59,7 +59,7 @@
#if FFMPEG_STABLE
{FMT_AMRWB, wxT("AMRWB"), wxT("amr"), wxT("amr"), 1,
false,false,_("AMR (wide band) Files (FFmpeg)"), CODEC_ID_AMR_WB, true},
#endif
- {FMT_WMA2, wxT("WMA"), wxT("wma"), wxT("asf"), 2, true
,false,_("WMA (version 2) Files (FFmpeg)"), CODEC_ID_WMAV2, true},
+ {FMT_WMA2, wxT("WMA"), wxT("wma"), wxT("asf"), 2,
false,false,_("WMA (version 2) Files (FFmpeg)"), CODEC_ID_WMAV2, true},
{FMT_OTHER, wxT("FFMPEG"), wxT(""), wxT(""), 255, true ,true
,_("Custom FFmpeg Export"), CODEC_ID_NONE, true}
};
Index: ExportFFmpeg.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/export/ExportFFmpeg.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- ExportFFmpeg.cpp 11 Nov 2009 05:40:54 -0000 1.64
+++ ExportFFmpeg.cpp 31 Dec 2009 09:16:13 -0000 1.65
@@ -313,22 +313,24 @@
if (!InitCodecs(project))
return false;
- // Write headers to the output file.
- if ((err = FFmpegLibsInst->av_write_header(mEncFormatCtx)) < 0)
- {
- wxLogMessage(wxT("FFmpeg : ERROR - Can't write headers to output file
\"%s\". Error code is %d."), mName.c_str(),err);
-
- return false;
- }
-
if (metadata == NULL) metadata = project->GetTags();
+ // Add metadata BEFORE writing the header.
+ // At the moment that works with ffmpeg-git and ffmpeg-0.5 for MP4.
if (fmts[mSubFormat].canmetadata)
{
mSupportsUTF8 = fmts[mSubFormat].canutf8;
AddTags(metadata);
}
+ // Write headers to the output file.
+ if ((err = FFmpegLibsInst->av_write_header(mEncFormatCtx)) < 0)
+ {
+ wxLogMessage(wxT("FFmpeg : ERROR - Can't write headers to output file
\"%s\". Error code is %d."), mName.c_str(),err);
+
+ return false;
+ }
+
return true;
}
------------------------------------------------------------------------------
This SF.Net email is sponsored by the Verizon Developer Community
Take advantage of Verizon's best-in-class app development support
A streamlined, 14 day to market process makes app distribution fast and easy
Join now and get one step closer to millions of Verizon customers
http://p.sf.net/sfu/verizon-dev2dev
_______________________________________________
Audacity-cvs mailing list
Audacity-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
