From ab715d2e8eb29998b60fa3bbc1ad95441cfb69b3 Mon Sep 17 00:00:00 2001 From: Thierry MERLE Date: Sun, 6 Jul 2008 14:07:34 +0200 Subject: v4l2-library: libv4l-sync-with-0.3.3-release From: Hans de Goede * Add open64 and mmap64 wrappers to the LD_PRELOAD wrapper libs, so that they also work for applications compiled with FILE_OFFSET_BITS=64, this fixes using them with v4l-info * While looking at xawtv in general, found a few bugs in xawtv itself, added a patch to fix those to the appl-patches dir * Talking about the appl-patches dir, restore that as it accidentally got dropped from 0.3.2 * Be more verbose in various places when it comes to logging (esp errors) * Change v4lconvert_enum_fmt code a bit, so that it is easier to add more supported destination formats to libv4lconvert * Don't return -EINVAL from try_fmt when we cannot convert because the cam doesn't have any formats we know. Instead just return as format whatever the cam returns from try_fmt, this new behavior is compliant with the v4l2 api as documented Signed-off-by: Hans de Goede Signed-off-by: Thierry MERLE --- v4l2-apps/lib/libv4l/include/libv4l1.h | 2 +- v4l2-apps/lib/libv4l/include/libv4l2.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'v4l2-apps/lib/libv4l/include') diff --git a/v4l2-apps/lib/libv4l/include/libv4l1.h b/v4l2-apps/lib/libv4l/include/libv4l1.h index fc188c32d..9036ae869 100644 --- a/v4l2-apps/lib/libv4l/include/libv4l1.h +++ b/v4l2-apps/lib/libv4l/include/libv4l1.h @@ -57,7 +57,7 @@ int v4l1_dup(int fd); int v4l1_ioctl (int fd, unsigned long int request, ...); ssize_t v4l1_read (int fd, void* buffer, size_t n); void *v4l1_mmap(void *start, size_t length, int prot, int flags, int fd, - off_t offset); + __off64_t offset); int v4l1_munmap(void *_start, size_t length); #ifdef __cplusplus diff --git a/v4l2-apps/lib/libv4l/include/libv4l2.h b/v4l2-apps/lib/libv4l/include/libv4l2.h index 0e88039b8..63529cf4b 100644 --- a/v4l2-apps/lib/libv4l/include/libv4l2.h +++ b/v4l2-apps/lib/libv4l/include/libv4l2.h @@ -58,7 +58,7 @@ int v4l2_dup(int fd); int v4l2_ioctl (int fd, unsigned long int request, ...); ssize_t v4l2_read (int fd, void* buffer, size_t n); void *v4l2_mmap(void *start, size_t length, int prot, int flags, int fd, - off_t offset); + __off64_t offset); int v4l2_munmap(void *_start, size_t length); -- cgit v1.2.3