summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2015-08-10 00:35:24 +0200
committerRobin Gareus <robin@gareus.org>2015-08-10 00:35:24 +0200
commit54ab3fb37e15f94fcc611f58f1af3df2b3b62c05 (patch)
tree4351759db3d4f0f605efdb37339be663cb004710
parent466c50d3a0d27dbb045fccba1caeeb5d44cfe73c (diff)
Disable video-export metadata on windows (for now)
Quote escaping metadata currently breaks export.
-rw-r--r--gtk2_ardour/export_video_dialog.cc2
-rw-r--r--gtk2_ardour/transcode_ffmpeg.cc3
2 files changed, 5 insertions, 0 deletions
diff --git a/gtk2_ardour/export_video_dialog.cc b/gtk2_ardour/export_video_dialog.cc
index 13f1f8fe4d..c497933e4b 100644
--- a/gtk2_ardour/export_video_dialog.cc
+++ b/gtk2_ardour/export_video_dialog.cc
@@ -195,7 +195,9 @@ ExportVideoDialog::ExportVideoDialog ()
t->attach (aspect_combo, 3, 4, ty, ty+1); ty++;
t->attach (bframes_checkbox, 0, 2, ty, ty+1);
t->attach (deinterlace_checkbox, 2, 4, ty, ty+1); ty++;
+#ifndef PLATFORM_WINDOWS
t->attach (meta_checkbox, 2, 4, ty, ty+1); ty++;
+#endif
t->attach (optimizations_checkbox, 0, 1, ty, ty+1);
t->attach (optimizations_label, 1, 4, ty, ty+1); ty++;
#if 1 /* tentative debug mode */
diff --git a/gtk2_ardour/transcode_ffmpeg.cc b/gtk2_ardour/transcode_ffmpeg.cc
index 94f8527cbb..2f0cb09074 100644
--- a/gtk2_ardour/transcode_ffmpeg.cc
+++ b/gtk2_ardour/transcode_ffmpeg.cc
@@ -326,10 +326,13 @@ TranscodeFfmpeg::encode (std::string outfile, std::string inf_a, std::string inf
argp[a++] = strdup(it->first.c_str());
argp[a++] = strdup(it->second.c_str());
}
+#ifndef PLATFORM_WINDOWS
+ // quote-escape does not work here. this needs further work (system_exec.cc)
for(TranscodeFfmpeg::FFSettings::const_iterator it = meta.begin(); it != meta.end(); ++it) {
argp[a++] = strdup("-metadata");
argp[a++] = format_metadata(it->first.c_str(), it->second.c_str());
}
+#endif
if (m_fps > 0) {
m_lead_in = rint (m_lead_in * m_fps) / m_fps;