summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sys/v4l2/v4l2src_calls.c6
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 803cf663..13afecd8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-27 Edgard Lima <edgard.lima@indt.org.br>
+
+ * gst-plugins-bad/sys/v4l2/v4l2src_calls.c: (gst_v4l2src_capture_init):
+ Small fix, now pwc driver can tell about its buffers.
+
2006-03-27 Tim-Philipp Müller <tim at centricular dot net>
* configure.ac:
diff --git a/sys/v4l2/v4l2src_calls.c b/sys/v4l2/v4l2src_calls.c
index 73adb042..19af162b 100644
--- a/sys/v4l2/v4l2src_calls.c
+++ b/sys/v4l2/v4l2src_calls.c
@@ -352,8 +352,11 @@ gst_v4l2src_capture_init (GstV4l2Src * v4l2src)
gst_atomic_int_set (&buffer->refcount, 1);
buffer->pool = v4l2src->pool;
+ memset (&buffer->buffer, 0x00, sizeof (buffer->buffer));
buffer->buffer.index = n;
- buffer->buffer.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+ buffer->buffer.type = v4l2src->breq.type;
+ buffer->buffer.memory = v4l2src->breq.memory;
+
if (ioctl (GST_V4L2ELEMENT (v4l2src)->video_fd, VIDIOC_QUERYBUF,
&buffer->buffer) < 0) {
GST_ELEMENT_ERROR (v4l2src, RESOURCE, READ, (NULL),
@@ -624,7 +627,6 @@ gst_v4l2src_get_fps (GstV4l2Src * v4l2src, gint * fps_n, gint * fps_d)
return TRUE;
}
}
-
return FALSE;
}