summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.net>2009-01-20 15:33:05 +0000
committerTim-Philipp Müller <tim@centricular.net>2009-01-20 15:33:05 +0000
commit6c565d2ee1061baa7efb3809fcc571a244df621b (patch)
tree7654e47db83931fef04339a0c1ba3565212a5142
parent0a89f5e50c67b7b76902af8898e7ba78289d49d6 (diff)
sys/v4l2/gstv4l2src.c: Fix error code (the message string also needs love, but not today).GIT_CONVERSION
Original commit message from CVS: * sys/v4l2/gstv4l2src.c: (gst_v4l2src_get_read): Fix error code (the message string also needs love, but not today).
-rw-r--r--ChangeLog5
-rw-r--r--sys/v4l2/gstv4l2src.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1dc868e6a..c8d8e8ef0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-20 Tim-Philipp Müller <tim.muller at collabora co uk>
+
+ * sys/v4l2/gstv4l2src.c: (gst_v4l2src_get_read):
+ Fix error code (the message string also needs love, but not today).
+
2009-01-19 Wim Taymans <wim.taymans@collabora.co.uk>
Patch by: Luotao Fu <l dot fu at pengutronix dot de>
diff --git a/sys/v4l2/gstv4l2src.c b/sys/v4l2/gstv4l2src.c
index 2b3dc21b4..4520f970e 100644
--- a/sys/v4l2/gstv4l2src.c
+++ b/sys/v4l2/gstv4l2src.c
@@ -1259,7 +1259,7 @@ gst_v4l2src_get_read (GstV4l2Src * v4l2src, GstBuffer ** buf)
/* ERRORS */
read_error:
{
- GST_ELEMENT_ERROR (v4l2src, RESOURCE, SYNC,
+ GST_ELEMENT_ERROR (v4l2src, RESOURCE, READ,
(_("Error reading %d bytes from device '%s'."),
buffersize, v4l2src->v4l2object->videodev), GST_ERROR_SYSTEM);
gst_buffer_unref (*buf);