qt4: v4l2 input no longer support audio capture. Use :input-slave=alsa:// instead.

(cherry picked from commit 9723a59803b71523d540d2070e60f2f11907d28e)

Signed-off-by: Jean-Paul Saman <jean-paul.saman@m2x.nl>

diff --git a/modules/gui/qt4/components/open_panels.cpp b/modules/gui/qt4/components/open_panels.cpp
index 31ed8b22298f75740f53e6f6c18badbf34775cb4..103208f9899a39220b9435f8216e0a4790a3d892 100644 (file)
--- a/modules/gui/qt4/components/open_panels.cpp
+++ b/modules/gui/qt4/components/open_panels.cpp
@@ -1153,14 +1153,14 @@ void CaptureOpenPanel::updateMRL()
     case V4L_DEVICE:
         fileList << "v4l://";
         mrl += " :v4l-vdev=" + v4lVideoDevice->text();
-        mrl += " :v4l-adev=" + v4lAudioDevice->text();
+        mrl += " :input-slave=alsa://" + v4lAudioDevice->text();
         mrl += " :v4l-norm=" + QString::number( v4lNormBox->currentIndex() );
         mrl += " :v4l-frequency=" + QString::number( v4lFreq->value() );
         break;
     case V4L2_DEVICE:
         fileList << "v4l2://";
         mrl += " :v4l2-dev=" + v4l2VideoDevice->text();
-        mrl += " :v4l2-adev=" + v4l2AudioDevice->text();
+        mrl += " :input-slave=alsa://" + v4l2AudioDevice->text();
         mrl += " :v4l2-standard=" + QString::number( v4l2StdBox->currentIndex() );
         break;
     case JACK_DEVICE: