diff options
| author | Tim-Philipp Müller <tim@centricular.net> | 2007-03-10 12:30:48 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.net> | 2007-03-10 12:30:48 +0000 |
| commit | 7236a2f8b3fe9994017ea871f1d185b552b3d5f7 (patch) | |
| tree | 980a77501c0d82cdfe881716819d823386c6f70f /sys/v4l2 | |
| parent | 647934baf9f14c6f5297e84247ecc0da8c93316c (diff) | |
Printf format fixes; also add some missing quotes in translated strings. Fixes #416728 and #416727.
Original commit message from CVS:
* gst/avi/gstavidemux.c: (gst_avi_demux_parse_subindex),
(gst_avi_demux_parse_index):
* sys/v4l2/v4l2_calls.c: (gst_v4l2_fill_lists):
* sys/v4l2/v4l2src_calls.c: (gst_v4l2src_grab_frame):
Printf format fixes; also add some missing quotes in translated
strings. Fixes #416728 and #416727.
Diffstat (limited to 'sys/v4l2')
| -rw-r--r-- | sys/v4l2/v4l2_calls.c | 6 | ||||
| -rw-r--r-- | sys/v4l2/v4l2src_calls.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/v4l2/v4l2_calls.c b/sys/v4l2/v4l2_calls.c index bd791b90..0721a2ea 100644 --- a/sys/v4l2/v4l2_calls.c +++ b/sys/v4l2/v4l2_calls.c @@ -123,7 +123,7 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l2object) vtun.index = input.tuner; if (ioctl (v4l2object->video_fd, VIDIOC_G_TUNER, &vtun) < 0) { GST_ELEMENT_ERROR (v4l2object->element, RESOURCE, SETTINGS, - (_("Failed to get setting of tuner &d on device '%s'."), + (_("Failed to get setting of tuner %d on device '%s'."), input.tuner, v4l2object->videodev), GST_ERROR_SYSTEM); g_object_unref (G_OBJECT (channel)); return FALSE; @@ -211,7 +211,7 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l2object) break; } else { GST_ELEMENT_ERROR (v4l2object->element, RESOURCE, SETTINGS, - (_("Failed getting controls attributes on device '%s."), + (_("Failed getting controls attributes on device '%s.'"), v4l2object->videodev), ("Failed querying control %d on device '%s'. (%d - %s)", n, v4l2object->videodev, errno, strerror (errno))); @@ -282,7 +282,7 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l2object) break; /* end of enumeration */ else { GST_ELEMENT_ERROR (v4l2object->element, RESOURCE, SETTINGS, - (_("Failed getting controls attributes on device '%s."), + (_("Failed getting controls attributes on device '%s'."), v4l2object->videodev), ("Failed to get %d in menu enumeration for %s. (%d - %s)", n, v4l2object->videodev, errno, strerror (errno))); diff --git a/sys/v4l2/v4l2src_calls.c b/sys/v4l2/v4l2src_calls.c index 7eef5471..756e3bff 100644 --- a/sys/v4l2/v4l2src_calls.c +++ b/sys/v4l2/v4l2src_calls.c @@ -160,7 +160,7 @@ gst_v4l2src_grab_frame (GstV4l2Src * v4l2src) while (ioctl (v4l2src->v4l2object->video_fd, VIDIOC_DQBUF, &buffer) < 0) { GST_LOG_OBJECT (v4l2src, - "problem grabbing frame %ld (ix=%ld), trials=%ld, pool-ct=%d, buf.flags=%d", + "problem grabbing frame %d (ix=%d), trials=%d, pool-ct=%d, buf.flags=%d", buffer.sequence, buffer.index, trials, v4l2src->pool->refcount, buffer.flags); @@ -221,7 +221,7 @@ gst_v4l2src_grab_frame (GstV4l2Src * v4l2src) } } - GST_LOG_OBJECT (v4l2src, "grabbed frame %ld (ix=%ld), pool-ct=%d", + GST_LOG_OBJECT (v4l2src, "grabbed frame %d (ix=%d), pool-ct=%d", buffer.sequence, buffer.index, v4l2src->pool->refcount); return buffer.index; |