diff --git a/ChangeLog b/ChangeLog index 755c8f3123..f0a5ac3ba7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-01-05 Ronald S. Bultje + + * sys/v4l/gstv4lsrc.c: (gst_v4lsrc_getcaps): + Fix framerate reporting. + 2005-01-05 Stephane LOEUILLET * gst-libs/gst/riff/riff-ids.h: diff --git a/sys/v4l/gstv4lsrc.c b/sys/v4l/gstv4lsrc.c index c24cc9c8d8..1c0eeb244a 100644 --- a/sys/v4l/gstv4lsrc.c +++ b/sys/v4l/gstv4lsrc.c @@ -814,7 +814,7 @@ gst_v4lsrc_getcaps (GstPad * pad) GstCaps *list; GstV4lSrc *v4lsrc = GST_V4LSRC (gst_pad_get_parent (pad)); struct video_capability *vcap = &GST_V4LELEMENT (v4lsrc)->vcap; - gfloat fps = 0.0; + gdouble fps; GList *item; if (!GST_V4L_IS_OPEN (GST_V4LELEMENT (v4lsrc))) { @@ -824,6 +824,7 @@ gst_v4lsrc_getcaps (GstPad * pad) /* FIXME: query current caps and return those, with _any appended */ return gst_caps_new_any (); } + fps = gst_v4lsrc_get_fps (v4lsrc); /* FIXME: if we choose a fixed one because we didn't probe, fixated caps don't @@ -862,6 +863,8 @@ gst_v4lsrc_getcaps (GstPad * pad) GstStructure *structure = gst_caps_get_structure (one, 0); gst_structure_set_value (structure, "framerate", v4lsrc->fps_list); + } else { + gst_caps_set_simple (one, "framerate", G_TYPE_DOUBLE, fps, NULL); } /* see higher up why we comment this else {