diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | sys/v4l2/v4l2src_calls.c | 3 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,9 @@ +2008-08-07 Jan Schmidt <Jan.Schmidt@sun.com> + + * sys/v4l2/v4l2src_calls.c: (gst_v4l2src_probe_caps_for_format): + When outputting a pad template range for the size, include a framerate + range too, to avoid 'not a real subset of template caps' errors. + 2008-08-06 Sebastian Dröge <sebastian.droege@collabora.co.uk> Based on a patch by: Jonathan Matthew <notverysmart at gmail dot com> diff --git a/sys/v4l2/v4l2src_calls.c b/sys/v4l2/v4l2src_calls.c index 7878f279..c35d3ee2 100644 --- a/sys/v4l2/v4l2src_calls.c +++ b/sys/v4l2/v4l2src_calls.c @@ -913,7 +913,8 @@ default_frame_sizes: /* if norm can't be used, copy the template framerate */ gst_structure_set (tmp, "width", GST_TYPE_INT_RANGE, min_w, max_w, - "height", GST_TYPE_INT_RANGE, min_h, max_h, NULL); + "height", GST_TYPE_INT_RANGE, min_h, max_h, + "framerate", GST_TYPE_FRACTION_RANGE, 0, 1, 100, 1, NULL); } gst_caps_append_structure (ret, tmp); |