Commit 9aba558d authored by Ilkka Ollakka's avatar 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.
parent b46a8cb9
...@@ -186,12 +186,16 @@ QString HTTPDestBox::getMRL( const QString& mux ) ...@@ -186,12 +186,16 @@ QString HTTPDestBox::getMRL( const QString& mux )
SoutMrl m; SoutMrl m;
m.begin( "http" ); m.begin( "http" );
/* http-output can't do mp4-mux, so don't accept it, /* Path-extension is primary muxer to use if possible,
if we don't get usable mux, fallback to flv */ otherwise check for mux-choise and see that it isn't mp4
if( !mux.isEmpty() && mux.compare("mp4") ) then fallback to flv*/
m.option( "mux", mux ); if ( !path.contains(QRegExp("\\..{2,3}$") ) )
else if ( !path.contains(QRegExp("\\..{2,3}$") ) ) {
m.option( "mux", "ffmpeg{mux=flv}" ); if( !mux.isEmpty() && mux.compare("mp4") )
m.option( "mux", mux );
else
m.option( "mux", "ffmpeg{mux=flv}" );
}
m.option( "dst", dst ); m.option( "dst", dst );
m.end(); m.end();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment