diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-08-04 08:32:25 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-08-04 08:32:25 -0300 |
| commit | 3d97516e337a4c1b0e057e3c8eb1d771878a5343 (patch) | |
| tree | 65d71ac7a5e4af8c329687c9bde6ab5ded0545d1 /v4l2-apps/lib/libv4l/appl-patches/xawtv-3.95-fixes.patch | |
| parent | fbc9468c72cac92d4b792aba7721520a92230677 (diff) | |
| parent | 8a0340d350bd2c22e02db44b4dcd920ad2af54b6 (diff) | |
| download | mediapointer-dvb-s2-3d97516e337a4c1b0e057e3c8eb1d771878a5343.tar.gz mediapointer-dvb-s2-3d97516e337a4c1b0e057e3c8eb1d771878a5343.tar.bz2 | |
merge: http://linuxtv.org/hg/~jfrancois/gspca/
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, 0 insertions, 29 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 deleted file mode 100644 index ccb077be0..000000000 --- a/v4l2-apps/lib/libv4l/appl-patches/xawtv-3.95-fixes.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- 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); |