mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-09-17 01:20:19 +00:00
v4l2object: Move back assertions where they should be
https://bugzilla.gnome.org/show_bug.cgi?id=720568
This commit is contained in:
parent
a64de44a0c
commit
5f1e47da24
1 changed files with 3 additions and 3 deletions
|
@ -2507,6 +2507,9 @@ gst_v4l2_object_set_format (GstV4l2Object * v4l2object, GstCaps * caps)
|
||||||
gint width, height, fps_n, fps_d, stride;
|
gint width, height, fps_n, fps_d, stride;
|
||||||
gint i = 0;
|
gint i = 0;
|
||||||
|
|
||||||
|
GST_V4L2_CHECK_OPEN (v4l2object);
|
||||||
|
GST_V4L2_CHECK_NOT_ACTIVE (v4l2object);
|
||||||
|
|
||||||
if (!gst_v4l2_object_get_caps_info (v4l2object, caps, &fmtdesc, &info))
|
if (!gst_v4l2_object_get_caps_info (v4l2object, caps, &fmtdesc, &info))
|
||||||
goto invalid_caps;
|
goto invalid_caps;
|
||||||
|
|
||||||
|
@ -2536,9 +2539,6 @@ gst_v4l2_object_set_format (GstV4l2Object * v4l2object, GstCaps * caps)
|
||||||
"%" GST_FOURCC_FORMAT " stride: %d", width, height,
|
"%" GST_FOURCC_FORMAT " stride: %d", width, height,
|
||||||
GST_FOURCC_ARGS (pixelformat), stride);
|
GST_FOURCC_ARGS (pixelformat), stride);
|
||||||
|
|
||||||
GST_V4L2_CHECK_OPEN (v4l2object);
|
|
||||||
GST_V4L2_CHECK_NOT_ACTIVE (v4l2object);
|
|
||||||
|
|
||||||
/* MPEG-TS source cameras don't get their format set for some reason.
|
/* MPEG-TS source cameras don't get their format set for some reason.
|
||||||
* It looks wrong and we weren't able to track down the reason for that code
|
* It looks wrong and we weren't able to track down the reason for that code
|
||||||
* so it is disabled until someone who has an mpeg-ts camera complains...
|
* so it is disabled until someone who has an mpeg-ts camera complains...
|
||||||
|
|
Loading…
Reference in a new issue