Revert "Disable video-export metadata on windows (for now)"

This reverts commit 54ab3fb37e15f94fcc611f58f1af3df2b3b62c05.

diff --git a/gtk2_ardour/export_video_dialog.cc b/gtk2_ardour/export_video_dialog.cc
index c497933e4bbe16e3be6acb1675ab3c59788eae04..13f1f8fe4d4e5e46fd79b6c330a5be6c27bf116b 100644 (file)
--- a/gtk2_ardour/export_video_dialog.cc
+++ b/gtk2_ardour/export_video_dialog.cc
@@ -195,9 +195,7 @@ 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 2f0cb09074f767a3e955923ce898b032713c507c..94f8527cbbe48a16b2baa077ffdcc088d5ef40cc 100644 (file)
--- a/gtk2_ardour/transcode_ffmpeg.cc
+++ b/gtk2_ardour/transcode_ffmpeg.cc
@@ -326,13 +326,10 @@ 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;