[vlc-commits] commit: Qt4: check extensionlength 2-4 (ts to webm) on sout regexpt ( Ilkka Ollakka )
git at videolan.org
git at videolan.org
Sun Jun 13 22:41:01 CEST 2010
vlc/vlc-1.1 | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Sun Jun 13 14:35:09 2010 +0300| [232e1175545cb4f51263c29b51b295cd026b3c4f] | committer: Ilkka Ollakka
Qt4: check extensionlength 2-4 (ts to webm) on sout regexpt
(cherry picked from commit f331c5a219d5dcd9edeeeecf52643e9cda7c2e37)
Signed-off-by: Ilkka Ollakka <ileoo at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=232e1175545cb4f51263c29b51b295cd026b3c4f
---
modules/gui/qt4/components/sout/sout_widgets.cpp | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/gui/qt4/components/sout/sout_widgets.cpp b/modules/gui/qt4/components/sout/sout_widgets.cpp
index e28ae3e..aa430b0 100644
--- a/modules/gui/qt4/components/sout/sout_widgets.cpp
+++ b/modules/gui/qt4/components/sout/sout_widgets.cpp
@@ -117,11 +117,11 @@ QString FileDestBox::getMRL( const QString& mux )
QString outputfile = fileEdit->text();
if( !mux.isEmpty() )
{
- if( outputfile.contains( QRegExp("\\..{2,3}$")) &&
+ if( outputfile.contains( QRegExp("\\..{2,4}$")) &&
!outputfile.endsWith(mux) )
{
/* Replace the extension according to muxer */
- outputfile.replace(QRegExp("\\..{2,3}$"),"."+mux);
+ outputfile.replace(QRegExp("\\..{2,4}$"),"."+mux);
} else if (!outputfile.endsWith( mux ) )
{
m.option( "mux", mux );
More information about the vlc-commits
mailing list