From 79941b1ccd1d022351c48c308155a684ba2ee81d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Fri, 20 Mar 2015 11:01:35 -0400
Subject: [PATCH] video: fix local camera openning

Commit be732d4737326dab3fad4201ba0bafe9c1bee656 introduce a regression on local camera input openning through v4l2. This patch fixes this and the fix from 33bc8cf709a9d2de4c85ca6e7c2714d752b9d9e0.

Refs #66543

Change-Id: Id727fcec5ee22be2fbee358236802e75e0c03f53
---
 daemon/src/media/video/v4l2/video_device_impl.cpp | 2 +-
 daemon/src/media/video/video_input.cpp            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/daemon/src/media/video/v4l2/video_device_impl.cpp b/daemon/src/media/video/v4l2/video_device_impl.cpp
index aa16d5502a..f6e1996b30 100644
--- a/daemon/src/media/video/v4l2/video_device_impl.cpp
+++ b/daemon/src/media/video/v4l2/video_device_impl.cpp
@@ -521,7 +521,7 @@ VideoDeviceImpl::getDeviceParams() const
 {
     DeviceParams params;
     params.input = device;
-    params.format = "v4l2";
+    params.format = "video4linux2";
     params.channel = channel_.idx;
     params.width = size_.width;
     params.height = size_.height;
diff --git a/daemon/src/media/video/video_input.cpp b/daemon/src/media/video/video_input.cpp
index 6c916ae40f..e76aec132d 100644
--- a/daemon/src/media/video/video_input.cpp
+++ b/daemon/src/media/video/video_input.cpp
@@ -317,7 +317,7 @@ VideoInput::switchInput(const std::string& resource)
 
     bool valid = false;
 
-    if (prefix == "v4l2") {
+    if (prefix == "video4linux2") {
         /* Video4Linux2 */
         valid = initCamera(suffix);
     } else if (prefix == "display") {
-- 
GitLab