[vlc-devel] commit: Qt: v4l2 syntax isn't :v4l2-dev= ... (Jean-Baptiste Kempf )

git version control git at videolan.org
Fri Jul 10 12:34:36 CEST 2009


vlc | branch: 1.0-bugfix | Jean-Baptiste Kempf <jb at videolan.org> | Fri Jul 10 12:30:12 2009 +0200| [a27003663e1b5e8f949e9fbee1adb3e56069154e] | committer: Jean-Baptiste Kempf 

Qt: v4l2 syntax isn't :v4l2-dev= ...
(cherry picked from commit 8d26f8c30bf2139ffe9c0a2bfd0db68fb640fd6a)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 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 b143a75..6e42e43 100644
--- a/modules/gui/qt4/components/open_panels.cpp
+++ b/modules/gui/qt4/components/open_panels.cpp
@@ -1146,8 +1146,7 @@ void CaptureOpenPanel::updateMRL()
         mrl += " :v4l-frequency=" + QString::number( v4lFreq->value() );
         break;
     case V4L2_DEVICE:
-        fileList << "v4l2://";
-        mrl += " :v4l2-dev=" + v4l2VideoDevice->text();
+        fileList << "v4l2://" + v4l2VideoDevice->text();
         mrl += " :input-slave=alsa://" + v4l2AudioDevice->text();
         mrl += " :v4l2-standard=" + QString::number( v4l2StdBox->currentIndex() );
         break;




More information about the vlc-devel mailing list