From d9fcd7e5495fbd0fe020223823338d21ce31dcaf Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Fri, 13 Feb 2009 12:56:07 +0100 Subject: libv4l2util: rename from libv4l2 to prevent clash with the libv4l2 conversion library From: Hans Verkuil libv4l2 was introduced to fix conversion problems. But this clashed with the already existing libv4l2 utility library. Renamed that libv4l2 library and header to libv4l2util. Priority: normal Signed-off-by: Hans Verkuil --- v4l2-apps/util/qv4l2/ctrl-tab.cpp | 2 +- v4l2-apps/util/qv4l2/general-tab.cpp | 2 +- v4l2-apps/util/qv4l2/qv4l2.cpp | 2 +- v4l2-apps/util/qv4l2/qv4l2.pro | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'v4l2-apps/util/qv4l2') diff --git a/v4l2-apps/util/qv4l2/ctrl-tab.cpp b/v4l2-apps/util/qv4l2/ctrl-tab.cpp index c7d1a275c..6f436b494 100644 --- a/v4l2-apps/util/qv4l2/ctrl-tab.cpp +++ b/v4l2-apps/util/qv4l2/ctrl-tab.cpp @@ -1,6 +1,6 @@ #include "qv4l2.h" -#include "v4l2.h" +#include "libv4l2util.h" #include #include diff --git a/v4l2-apps/util/qv4l2/general-tab.cpp b/v4l2-apps/util/qv4l2/general-tab.cpp index 3b9ad2e5b..78656cf10 100644 --- a/v4l2-apps/util/qv4l2/general-tab.cpp +++ b/v4l2-apps/util/qv4l2/general-tab.cpp @@ -20,7 +20,7 @@ #include "qv4l2.h" #include "general-tab.h" -#include "v4l2.h" +#include "libv4l2util.h" #include #include diff --git a/v4l2-apps/util/qv4l2/qv4l2.cpp b/v4l2-apps/util/qv4l2/qv4l2.cpp index d144723d9..764fbd172 100644 --- a/v4l2-apps/util/qv4l2/qv4l2.cpp +++ b/v4l2-apps/util/qv4l2/qv4l2.cpp @@ -1,7 +1,7 @@ #include "qv4l2.h" #include "general-tab.h" -#include "v4l2.h" +#include "libv4l2util.h" #include #include diff --git a/v4l2-apps/util/qv4l2/qv4l2.pro b/v4l2-apps/util/qv4l2/qv4l2.pro index 5e0b7555d..770c2d702 100644 --- a/v4l2-apps/util/qv4l2/qv4l2.pro +++ b/v4l2-apps/util/qv4l2/qv4l2.pro @@ -9,4 +9,4 @@ CONFIG += debug # Input HEADERS += qv4l2.h general-tab.h SOURCES += qv4l2.cpp general-tab.cpp ctrl-tab.cpp -LIBS += -lv4l2 -L../../lib +LIBS += -lv4l2util -L../../lib -- cgit v1.2.3