diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-08 07:20:50 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-08 07:20:50 -0300 |
| commit | 9380e197397e3f8404fa2d2effe5c84b6f56735b (patch) | |
| tree | 81fcf4dc9edfd73f6e0ff211cb2df17a9e79dc16 /v4l2-apps/lib/libv4l/appl-patches/xawtv-3.95-fixes.patch | |
| parent | ea33affdbd8d71fab71e3f62845b9239d6f60ff8 (diff) | |
| parent | 4e748efa7677d0762f4b1738cd8869df5eb106b6 (diff) | |
| download | mediapointer-dvb-s2-9380e197397e3f8404fa2d2effe5c84b6f56735b.tar.gz mediapointer-dvb-s2-9380e197397e3f8404fa2d2effe5c84b6f56735b.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~tmerle/v4l2-library
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'v4l2-apps/lib/libv4l/appl-patches/xawtv-3.95-fixes.patch')
| -rw-r--r-- | v4l2-apps/lib/libv4l/appl-patches/xawtv-3.95-fixes.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/v4l2-apps/lib/libv4l/appl-patches/xawtv-3.95-fixes.patch b/v4l2-apps/lib/libv4l/appl-patches/xawtv-3.95-fixes.patch new file mode 100644 index 000000000..ccb077be0 --- /dev/null +++ b/v4l2-apps/lib/libv4l/appl-patches/xawtv-3.95-fixes.patch @@ -0,0 +1,29 @@ +--- xawtv-3.95/libng/plugins/drv0-v4l2.c 2005-02-11 18:56:24.000000000 +0100 ++++ xawtv-3.95.new/libng/plugins/drv0-v4l2.c 2008-07-05 21:12:37.000000000 +0200 +@@ -161,7 +161,7 @@ + #define PREFIX "ioctl: " + + static int +-xioctl(int fd, int cmd, void *arg, int mayfail) ++xioctl(int fd, unsigned long int cmd, void *arg, int mayfail) + { + int rc; + +@@ -768,6 +768,7 @@ + /* get it */ + memset(&buf,0,sizeof(buf)); + buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; ++ buf.memory = V4L2_MEMORY_MMAP; + if (-1 == xioctl(h->fd,VIDIOC_DQBUF,&buf, 0)) + return -1; + h->waiton++; +@@ -813,8 +814,7 @@ + if (-1 == xioctl(h->fd, VIDIOC_QUERYBUF, &h->buf_v4l2[i], 0)) + return -1; + h->buf_me[i].fmt = h->fmt_me; +- h->buf_me[i].size = h->buf_me[i].fmt.bytesperline * +- h->buf_me[i].fmt.height; ++ h->buf_me[i].size = h->buf_v4l2[i].length; + h->buf_me[i].data = mmap(NULL, h->buf_v4l2[i].length, + PROT_READ | PROT_WRITE, MAP_SHARED, + h->fd, h->buf_v4l2[i].m.offset); |