[vlc-commits] commit: qt4: don't add duplicate on convert if not needed (Ilkka Ollakka )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Sat May 15 20:43:36 2010 +0300| [a4b72e97ff81b7a77e841c165bab59673404ce7f] | committer: Ilkka Ollakka 

qt4: don't add duplicate on convert if not needed
(cherry picked from commit f01fe561104e3c62fe77366d3c19b77bf8776a9a)

Signed-off-by: Ilkka Ollakka <ileoo at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=a4b72e97ff81b7a77e841c165bab59673404ce7f
---

 modules/gui/qt4/dialogs/convert.cpp |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/gui/qt4/dialogs/convert.cpp b/modules/gui/qt4/dialogs/convert.cpp
index cd2c8a8..fc37194 100644
--- a/modules/gui/qt4/dialogs/convert.cpp
+++ b/modules/gui/qt4/dialogs/convert.cpp
@@ -135,10 +135,12 @@ void ConvertDialog::close()
             mrl.remove( '}' );
             mrl += ",deinterlace}";
         }
-        mrl += ":duplicate{";
-        if( displayBox->isChecked() ) mrl += "dst=display,";
-        mrl += "dst=std{access=file,mux=" + profile->getMux() +
-            ",dst='" + fileLine->text() + "'}";
+        mrl += ":";
+        if( displayBox->isChecked() )
+            mrl += "duplicate{dst=display,dst=";
+        mrl += "file{dst='" + fileLine->text() + "'}";
+        if( displayBox->isChecked() )
+            mrl += "}";
     }
 
     msg_Warn( p_intf, "Transcode MRL: %s", qtu( mrl ) );