[vlc-devel] commit: Correctly pass all the arguments of v4l/dshow when transcoding. ( Jean-Baptiste Kempf )
git version control
git at videolan.org
Mon Sep 8 01:24:24 CEST 2008
vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Sep 7 00:48:52 2008 -0700| [fe82c45f12cb29946722c3830e872685ad225100] | committer: Jean-Baptiste Kempf
Correctly pass all the arguments of v4l/dshow when transcoding.
Close #1998.
(cherry picked from commit fd3426910f6ffa1db76659974ff54ba24363217a)
(cherry picked from commit 56c38ae8d2f4a31aa2145997a7bb603a50a11811)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=fe82c45f12cb29946722c3830e872685ad225100
---
modules/gui/qt4/dialogs/open.cpp | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/modules/gui/qt4/dialogs/open.cpp b/modules/gui/qt4/dialogs/open.cpp
index 35d1d5a..0643c37 100644
--- a/modules/gui/qt4/dialogs/open.cpp
+++ b/modules/gui/qt4/dialogs/open.cpp
@@ -349,9 +349,30 @@ void OpenDialog::stream( bool b_transcode_only )
{
mrl = ui.advancedLineInput->text();
toggleVisible();
+
+ /* Separate the entries */
QStringList listMRL = SeparateEntries( mrl );
+
+ /* We can only take the first entry since we have no idea what
+ to do with many files ? Gather ? */
if( listMRL.size() > 0 )
- THEDP->streamingDialog( this, listMRL[0], b_transcode_only );
+ {
+ /* First item */
+ QString soutMRL = listMRL[0];
+
+ /* Keep all the :xxx options because they are needed see v4l and dshow */
+ for( int i = 1; i < listMRL.size(); i++ )
+ {
+ if( listMRL[i].at( 0 ) == ':' )
+ soutMRL.append( " " + listMRL[i] );
+ else
+ break;
+ }
+
+ /* Dbg and send :D */
+ msg_Dbg( p_intf, "MRL passed to the Sout: %s", qtu( soutMRL ) );
+ THEDP->streamingDialog( this, listMRL[0], b_transcode_only );
+ }
}
/* Update the MRL */
More information about the vlc-devel
mailing list