Fixup fromcvs/togit conversion
[minix-pkgsrc.git] / multimedia / tvtime / patches / patch-ac
blob182877cd46081a61de4243f318015605dfdd1985
1 $NetBSD$
3 --- src/videoinput.c.orig       2005-09-07 23:13:37.000000000 -0400
4 +++ src/videoinput.c
5 @@ -35,8 +35,13 @@
6  #ifdef HAVE_CONFIG_H
7  # include "config.h"
8  #endif
9 +#ifdef __NetBSD__
10 +#include <sys/videoio.h>
11 +#include "videodev.h"
12 +#else
13  #include "videodev.h"
14  #include "videodev2.h"
15 +#endif
16  #include "videoinput.h"
17  #include "mixer.h"
19 @@ -377,6 +382,7 @@ uint8_t *videoinput_next_frame( videoinp
20          wait_for_frame_v4l2( vidin );
21   
22          cur_buf.type = vidin->capbuffers[ 0 ].vidbuf.type;
23 +       cur_buf.memory = vidin->capbuffers[ 0 ].vidbuf.memory;
24          if( ioctl( vidin->grab_fd, VIDIOC_DQBUF, &cur_buf ) < 0 ) {
25              /* some drivers return EIO when there is no signal */
26              if( errno != EIO ) {