diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-09 22:49:32 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-09 22:49:32 -0300 |
| commit | 01c235ac360b8150c04a265f7b9ba1a107d02d87 (patch) | |
| tree | 6047e67376ce92faf0da33a833c5bce3d205812d /v4l2-apps/lib | |
| parent | e9314ad63401c89bffe82b165eb7ae630c05a75d (diff) | |
| parent | 392c43e11f7a7100ac5a3ca447669e23f2e835dd (diff) | |
| download | mediapointer-dvb-s2-01c235ac360b8150c04a265f7b9ba1a107d02d87.tar.gz mediapointer-dvb-s2-01c235ac360b8150c04a265f7b9ba1a107d02d87.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-compat
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'v4l2-apps/lib')
| -rw-r--r-- | v4l2-apps/lib/libv4l/ChangeLog | 4 | ||||
| -rw-r--r-- | v4l2-apps/lib/libv4l/libv4l1/libv4l1-priv.h | 9 | ||||
| -rw-r--r-- | v4l2-apps/lib/libv4l/libv4l1/libv4l1.c | 2 |
3 files changed, 12 insertions, 3 deletions
diff --git a/v4l2-apps/lib/libv4l/ChangeLog b/v4l2-apps/lib/libv4l/ChangeLog index 14c5625a1..def38e046 100644 --- a/v4l2-apps/lib/libv4l/ChangeLog +++ b/v4l2-apps/lib/libv4l/ChangeLog @@ -1,5 +1,5 @@ -libv4l-0.3.4 ------------- +libv4l-0.3.4 (the brownpaperbag release) +---------------------------------------- * The mmap64 support in 0.3.3, has caused a bug in libv4l1 when running on 32 bit systems (who uses those now a days?), this bug caused v4l1 compatibility to not work at all, this release fixes this diff --git a/v4l2-apps/lib/libv4l/libv4l1/libv4l1-priv.h b/v4l2-apps/lib/libv4l/libv4l1/libv4l1-priv.h index e107581d1..e09041256 100644 --- a/v4l2-apps/lib/libv4l/libv4l1/libv4l1-priv.h +++ b/v4l2-apps/lib/libv4l/libv4l1/libv4l1-priv.h @@ -22,6 +22,15 @@ #include <stdio.h> #include <pthread.h> +/* On 32 bits archs we always use mmap2, on 64 bits archs there is no mmap2 */ +#ifdef __NR_mmap2 +#define SYS_mmap2 __NR_mmap2 +#define MMAP2_PAGE_SHIFT 12 +#else +#define SYS_mmap2 SYS_mmap +#define MMAP2_PAGE_SHIFT 0 +#endif + #define V4L1_MAX_DEVICES 16 #define V4L1_NO_FRAMES 4 #define V4L1_FRAME_BUF_SIZE (4096 * 4096) diff --git a/v4l2-apps/lib/libv4l/libv4l1/libv4l1.c b/v4l2-apps/lib/libv4l/libv4l1/libv4l1.c index 40e4b2aa1..b80fcb56d 100644 --- a/v4l2-apps/lib/libv4l/libv4l1/libv4l1.c +++ b/v4l2-apps/lib/libv4l/libv4l1/libv4l1.c @@ -644,7 +644,7 @@ int v4l1_ioctl (int fd, unsigned long int request, ...) } if (devices[index].v4l1_frame_pointer == MAP_FAILED) { - devices[index].v4l1_frame_pointer = (void *)syscall(SYS_mmap, NULL, + devices[index].v4l1_frame_pointer = (void *)syscall(SYS_mmap2, NULL, (size_t)mbuf->size, PROT_READ|PROT_WRITE, MAP_ANONYMOUS|MAP_PRIVATE, -1, 0); |