[vlc-commits] commit: qt4: little fix for sout-http muxing check (Ilkka Ollakka )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Sun May 16 14:22:57 2010 +0300| [800b5925e9856fd66475918f464856d280f08f95] | committer: Ilkka Ollakka 

qt4: little fix for sout-http muxing check

First priority is file-extension user gives, if that isn't
specified, use mux-value and if that's not valid (eg mp4), fallback
to flv-muxing.
(cherry picked from commit 9aba558dbc3441a9f96eca41fe823e84907bc2d4)

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

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

 modules/gui/qt4/components/sout/sout_widgets.cpp |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/modules/gui/qt4/components/sout/sout_widgets.cpp b/modules/gui/qt4/components/sout/sout_widgets.cpp
index 02ad3be..497ea6e 100644
--- a/modules/gui/qt4/components/sout/sout_widgets.cpp
+++ b/modules/gui/qt4/components/sout/sout_widgets.cpp
@@ -186,12 +186,16 @@ QString HTTPDestBox::getMRL( const QString& mux )
 
     SoutMrl m;
     m.begin( "http" );
-    /* http-output can't do mp4-mux, so don't accept it,
-       if we don't get usable mux, fallback to flv */
-    if( !mux.isEmpty() && mux.compare("mp4") )
-        m.option( "mux", mux );
-    else if ( !path.contains(QRegExp("\\..{2,3}$") ) )
-        m.option( "mux", "ffmpeg{mux=flv}" );
+    /* Path-extension is primary muxer to use if possible,
+       otherwise check for mux-choise and see that it isn't mp4
+       then fallback to flv*/
+    if ( !path.contains(QRegExp("\\..{2,3}$") ) )
+    {
+        if( !mux.isEmpty() && mux.compare("mp4") )
+           m.option( "mux", mux );
+        else
+           m.option( "mux", "ffmpeg{mux=flv}" );
+    }
     m.option( "dst", dst );
     m.end();