From b567a0215011dc621b1bad9196297c6b2fbcddb3 Mon Sep 17 00:00:00 2001
From: jp9000 <obs.jim@gmail.com>
Date: Mon, 9 May 2016 14:14:43 -0700
Subject: [PATCH] UI: Allow remuxing to/from different formats

Instead of just remuxing from FLV to MP4, allow remuxing to/from the
various container formats that are available.
---
 obs/data/locale/en-US.ini | 2 +-
 obs/window-remux.cpp      | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/obs/data/locale/en-US.ini b/obs/data/locale/en-US.ini
index 9a65b5e0f..90cb492fb 100644
--- a/obs/data/locale/en-US.ini
+++ b/obs/data/locale/en-US.ini
@@ -138,7 +138,7 @@ LicenseAgreement.Exit="Exit"
 Remux.SourceFile="OBS Recording"
 Remux.TargetFile="Target File"
 Remux.Remux="Remux"
-Remux.RecordingPattern="OBS Recording (*.flv)"
+Remux.OBSRecording="OBS Recording"
 Remux.FinishedTitle="Remuxing finished"
 Remux.Finished="Recording remuxed"
 Remux.FinishedError="Recording remuxed, but the file may be incomplete"
diff --git a/obs/window-remux.cpp b/obs/window-remux.cpp
index 2802f3ed6..ea9ecce7f 100644
--- a/obs/window-remux.cpp
+++ b/obs/window-remux.cpp
@@ -97,6 +97,8 @@ OBSRemux::~OBSRemux()
 	remuxer.wait();
 }
 
+#define RECORDING_PATTERN "(*.flv *.mp4 *.mov *.mkv *.ts *.m3u8)"
+
 void OBSRemux::BrowseInput()
 {
 	QString path = ui->sourceFile->text();
@@ -105,7 +107,8 @@ void OBSRemux::BrowseInput()
 
 	path = QFileDialog::getOpenFileName(this,
 			QTStr("Remux.SelectRecording"), path,
-			QTStr("Remux.RecordingPattern"));
+			QTStr("Remux.OBSRecording") + QString(" ") +
+			RECORDING_PATTERN);
 
 	inputChanged(path);
 }
@@ -132,7 +135,7 @@ void OBSRemux::BrowseOutput()
 {
 	QString path(ui->targetFile->text());
 	path = QFileDialog::getSaveFileName(this, QTStr("Remux.SelectTarget"),
-				path, "(*.mp4)");
+				path, RECORDING_PATTERN);
 
 	if (path.isEmpty())
 		return;
-- 
GitLab