diff options
| author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2004-10-25 08:40:07 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2004-10-25 08:40:07 +0000 |
| commit | 637d0fcfb5a03f7e1b71655b1551b8db8363f278 (patch) | |
| tree | b4403a956b46ca4bc35c645317e6d749b7284001 /sys | |
| parent | 2596d36dd043bc725e69e8364766db1a9582c768 (diff) | |
| download | gst-plugins-bad-637d0fcfb5a03f7e1b71655b1551b8db8363f278.tar.gz gst-plugins-bad-637d0fcfb5a03f7e1b71655b1551b8db8363f278.tar.bz2 gst-plugins-bad-637d0fcfb5a03f7e1b71655b1551b8db8363f278.zip | |
sys/oss/gstosssrc.*: OK, so people want offset in DEFAULT. This time, actually fix all cases.
Original commit message from CVS:
* sys/oss/gstosssrc.c: (gst_osssrc_get_time), (gst_osssrc_get),
(gst_osssrc_src_query):
* sys/oss/gstosssrc.h:
OK, so people want offset in DEFAULT. This time, actually fix all
cases.
* sys/v4l2/gstv4l2src.c: (gst_v4l2src_getcaps):
Add FPS properly.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/v4l2/gstv4l2src.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/v4l2/gstv4l2src.c b/sys/v4l2/gstv4l2src.c index 40bc0dae..af20eebb 100644 --- a/sys/v4l2/gstv4l2src.c +++ b/sys/v4l2/gstv4l2src.c @@ -768,6 +768,7 @@ gst_v4l2src_getcaps (GstPad * pad) int min_w, max_w, min_h, max_h; GSList *walk; GstStructure *structure; + gdouble fps; if (!GST_V4L2_IS_OPEN (GST_V4L2ELEMENT (v4l2src))) { return gst_caps_copy (gst_pad_get_pad_template_caps (pad)); @@ -776,6 +777,7 @@ gst_v4l2src_getcaps (GstPad * pad) /* build our own capslist */ caps = gst_caps_new_empty (); walk = v4l2src->formats; + fps = gst_v4l2src_get_fps (v4l2src); while (walk) { format = (struct v4l2_fmtdesc *) walk->data; walk = g_slist_next (walk); @@ -793,7 +795,7 @@ gst_v4l2src_getcaps (GstPad * pad) gst_structure_set (structure, "width", GST_TYPE_INT_RANGE, min_w, max_w, "height", GST_TYPE_INT_RANGE, min_h, max_h, - "framerate", GST_TYPE_DOUBLE_RANGE, (double) 0, G_MAXDOUBLE, NULL); + "framerate", G_TYPE_DOUBLE, fps, NULL); gst_caps_append_structure (caps, structure); } |