From f2ff9c1617fcf25df3deaf67841e4cf58508e0fa Mon Sep 17 00:00:00 2001 From: Edgard Lima Date: Tue, 2 May 2006 21:52:48 +0000 Subject: Fix get_caps func to work when no framerate is available and the caps isn't simple. Original commit message from CVS: Fix get_caps func to work when no framerate is available and the caps isn't simple. --- ChangeLog | 6 ++++++ sys/v4l2/gstv4l2src.c | 8 +++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index ec78ace7..60e179ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-05-02 Edgard Lima + + * sys/v4l2/gstv4l2src.c: (gst_v4l2src_get_caps): + Fix get_caps func to work when no framerate is available and the caps + isn't simple. + 2006-05-01 Edgard Lima * sys/v4l2/Makefile.am: diff --git a/sys/v4l2/gstv4l2src.c b/sys/v4l2/gstv4l2src.c index 0f6f1a7f..126cd421 100644 --- a/sys/v4l2/gstv4l2src.c +++ b/sys/v4l2/gstv4l2src.c @@ -675,15 +675,13 @@ gst_v4l2src_get_caps (GstBaseSrc * src) if (fps_n > 0) { gst_structure_set (structure, "framerate", GST_TYPE_FRACTION, fps_n, fps_d, NULL); + } else { + gst_structure_set (structure, "framerate", GST_TYPE_FRACTION_RANGE, + 1, 1, 100, 1, NULL); } gst_caps_append_structure (caps, structure); - if (fps_n <= 0) { - gst_caps_set_simple (caps, "framerate", GST_TYPE_FRACTION_RANGE, - 1, 1, 100, 1, NULL); - } - } } -- cgit v1.2.1