From 131acb2bc82e933c7adcd979ca23efa61e6311a8 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 29 Jun 2018 00:05:19 +0100
Subject: Prevent FFmpeg errors if export filenames are specified with no or
 incorrect extensions.

---
 src/wx/export_dialog.cc | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/wx/export_dialog.cc b/src/wx/export_dialog.cc
index 95814c518..87a824882 100644
--- a/src/wx/export_dialog.cc
+++ b/src/wx/export_dialog.cc
@@ -38,6 +38,11 @@ wxString format_filters[] = {
 	_("MP4 files (*.mp4)|*.mp4"),
 };
 
+wxString format_extensions[] = {
+	"mov",
+	"mp4"
+};
+
 FFmpegEncoder::Format formats[] = {
 	FFmpegEncoder::FORMAT_PRORES,
 	FFmpegEncoder::FORMAT_H264,
@@ -81,7 +86,9 @@ ExportDialog::format_changed ()
 boost::filesystem::path
 ExportDialog::path () const
 {
-	return wx_to_std (_file->GetPath ());
+	wxFileName fn (_file->GetPath());
+	fn.SetExt (format_extensions[_format->GetSelection()]);
+	return wx_to_std (fn.GetFullPath());
 }
 
 FFmpegEncoder::Format
-- 
cgit v1.2.3