diff options
| author | Jan Schmidt <thaytan@mad.scientist.com> | 2008-01-31 16:12:28 +0000 |
|---|---|---|
| committer | Jan Schmidt <thaytan@mad.scientist.com> | 2008-01-31 16:12:28 +0000 |
| commit | 38baf136e683dada57786f1dcfa263330516e79b (patch) | |
| tree | 9169fb99c283f0abd6948446c915dc49f7038cfb /sys/v4l2/v4l2_calls.c | |
| parent | 27d41809a01c0b2680acda1cf762517a0bb4aef4 (diff) | |
sys/v4l2/v4l2_calls.c: Treat ENOTTY (driver does not implement ioctl) the same as
Original commit message from CVS:
* sys/v4l2/v4l2_calls.c: (gst_v4l2_fill_lists):
Treat ENOTTY (driver does not implement ioctl) the same as
EINVAL since it implies there are no available standards.
* sys/v4l2/v4l2src_calls.c: (gst_v4l2src_probe_caps_for_format),
(gst_v4l2src_get_nearest_size):
Replace gst_v4l2src_get_size_limits with 2 calls to new function
gst_v4l2src_get_nearest_size, and get it to use VIDIOC_S_FMT to
probe if the driver does not support VIDIOC_TRY_FMT for whatever
reason, and if we aren't yet actively capturing.
* sys/v4l2/v4l2src_calls.h:
Remove replaced function declaration.
Diffstat (limited to 'sys/v4l2/v4l2_calls.c')
| -rw-r--r-- | sys/v4l2/v4l2_calls.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/v4l2/v4l2_calls.c b/sys/v4l2/v4l2_calls.c index 616f659f..e22678ce 100644 --- a/sys/v4l2/v4l2_calls.c +++ b/sys/v4l2/v4l2_calls.c @@ -185,7 +185,7 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l2object) standard.index = n; if (ioctl (v4l2object->video_fd, VIDIOC_ENUMSTD, &standard) < 0) { - if (errno == EINVAL) + if (errno == EINVAL || errno == ENOTTY) break; /* end of enumeration */ else { GST_ELEMENT_ERROR (e, RESOURCE, SETTINGS, |