[vlc-commits] Revert "Qt: escape demuxdump filename (refs #19841)"
Hugo Beauzée-Luyssen
git at videolan.org
Fri Apr 13 16:14:19 CEST 2018
vlc/vlc-3.0 | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Fri Apr 13 16:01:38 2018 +0200| [bc70f9143c3fe1985dc69b2958a5e199d26e5710] | committer: Hugo Beauzée-Luyssen
Revert "Qt: escape demuxdump filename (refs #19841)"
This reverts commit 2de830a525e394004daaadc83ee6726d5a359fd8.
Fix #20026
(cherry picked from commit 44394a1021e32a0dbb268b3a4d5bf6d62a9d0b83)
Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>
> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=bc70f9143c3fe1985dc69b2958a5e199d26e5710
---
modules/gui/qt/dialogs/convert.cpp | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/modules/gui/qt/dialogs/convert.cpp b/modules/gui/qt/dialogs/convert.cpp
index 7ae9be5d92..8a87518fa9 100644
--- a/modules/gui/qt/dialogs/convert.cpp
+++ b/modules/gui/qt/dialogs/convert.cpp
@@ -178,13 +178,10 @@ void ConvertDialog::close()
for(int i = 0; i < incomingMRLs->length(); i++)
{
QString mrl;
- QString newFileName;
if( dumpRadio->isChecked() )
{
- newFileName = fileLine->text();
- newFileName.replace( QChar('\''), "\\\'" );
- mrl = QString( "demux=dump :demuxdump-file='%1'" ).arg( newFileName );
+ mrl = "demux=dump :demuxdump-file=" + fileLine->text();
}
else
{
@@ -200,6 +197,8 @@ void ConvertDialog::close()
mrl += "duplicate{dst=display,dst=";
}
+ QString newFileName;
+
// Only one file, use the destination provided
if(singleFileSelected)
{
More information about the vlc-commits
mailing list