diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-02-13 12:56:07 +0100 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2009-02-13 12:56:07 +0100 |
| commit | d9fcd7e5495fbd0fe020223823338d21ce31dcaf (patch) | |
| tree | b940ae37e5d028fb136c13ed1b2f859f2ec3f5f2 /v4l2-apps/lib | |
| parent | 404ee5d5dea9be4f51d5a436a2a33a00e47be1ed (diff) | |
| download | mediapointer-dvb-s2-d9fcd7e5495fbd0fe020223823338d21ce31dcaf.tar.gz mediapointer-dvb-s2-d9fcd7e5495fbd0fe020223823338d21ce31dcaf.tar.bz2 | |
libv4l2util: rename from libv4l2 to prevent clash with the libv4l2 conversion library
From: Hans Verkuil <hverkuil@xs4all.nl>
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 <hverkuil@xs4all.nl>
Diffstat (limited to 'v4l2-apps/lib')
| -rw-r--r-- | v4l2-apps/lib/Makefile | 6 | ||||
| -rw-r--r-- | v4l2-apps/lib/frequencies.c | 2 | ||||
| -rw-r--r-- | v4l2-apps/lib/libv4l2util.h (renamed from v4l2-apps/lib/v4l2.h) | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/v4l2-apps/lib/Makefile b/v4l2-apps/lib/Makefile index 8443039b4..f3f413071 100644 --- a/v4l2-apps/lib/Makefile +++ b/v4l2-apps/lib/Makefile @@ -2,12 +2,12 @@ CPPFLAGS += -I../include -I.. -includes = v4l2.h +includes = libv4l2util.h objects = frequencies.o v4l2_driver.o -sharedlib = libv4l2.so -staticlib = libv4l2.a +sharedlib = libv4l2util.so +staticlib = libv4l2util.a ifeq ($(prefix),) prefix = /usr diff --git a/v4l2-apps/lib/frequencies.c b/v4l2-apps/lib/frequencies.c index 64379d2b0..df8d47dba 100644 --- a/v4l2-apps/lib/frequencies.c +++ b/v4l2-apps/lib/frequencies.c @@ -22,7 +22,7 @@ #include <stdlib.h> #include <linux/videodev2.h> -#include "v4l2.h" +#include "libv4l2util.h" /* This source was originally written by Nathan Laredo <laredo@gnu.org>. He kindly gave permission to release this source under the LGPL diff --git a/v4l2-apps/lib/v4l2.h b/v4l2-apps/lib/libv4l2util.h index 172688853..fde7cdc75 100644 --- a/v4l2-apps/lib/v4l2.h +++ b/v4l2-apps/lib/libv4l2util.h @@ -15,8 +15,8 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#ifndef _V4L2_H_ -#define _V4L2_H_ +#ifndef _V4L2UTIL_H_ +#define _V4L2UTIL_H_ /* --------------------------------------------------------------------- */ |