From ab01993d33a691dde8cc70aa20d8249e3f913e8b Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Thu, 7 Aug 2008 10:22:32 +0000 Subject: [PATCH] sys/v4l2/v4l2src_calls.c: When outputting a pad template range for the size, include a framerate range too, to avoid ... Original commit message from CVS: * 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. --- ChangeLog | 6 ++++++ sys/v4l2/v4l2src_calls.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3ed39f6cd9c..b52ffd3ca6f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-08-07 Jan Schmidt + + * 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 Based on a patch by: Jonathan Matthew diff --git a/sys/v4l2/v4l2src_calls.c b/sys/v4l2/v4l2src_calls.c index 7878f279e60..c35d3ee272f 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);