[vlc-devel] commit: Qt4: fix V4L1 device node specification ( Rémi Denis-Courmont )

git version control git at videolan.org
Sat Nov 7 10:56:42 CET 2009


vlc | branch: 1.0-bugfix | Rémi Denis-Courmont <remi at remlab.net> | Sat Nov  7 11:54:53 2009 +0200| [eb357780901afb66e7aa6e59064cae5dc6138308] | committer: Rémi Denis-Courmont 

Qt4: fix V4L1 device node specification

--v4l-vdev is obsolete.
(cherry picked from commit 323d19aa2710e1dc1d5f2dbdef32d7fa43e7909d)

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

 modules/gui/qt4/components/open_panels.cpp |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/modules/gui/qt4/components/open_panels.cpp b/modules/gui/qt4/components/open_panels.cpp
index f65d310..5a39f48 100644
--- a/modules/gui/qt4/components/open_panels.cpp
+++ b/modules/gui/qt4/components/open_panels.cpp
@@ -1140,8 +1140,7 @@ void CaptureOpenPanel::updateMRL()
         break;
 #else
     case V4L_DEVICE:
-        fileList << "v4l://";
-        mrl += " :v4l-vdev=" + v4lVideoDevice->text();
+        fileList << "v4l://" + v4lVideoDevice->text();
         mrl += " :input-slave=alsa://" + v4lAudioDevice->text();
         mrl += " :v4l-norm=" + QString::number( v4lNormBox->currentIndex() );
         mrl += " :v4l-frequency=" + QString::number( v4lFreq->value() );




More information about the vlc-devel mailing list