summaryrefslogtreecommitdiffstats
path: root/sys/v4l2/v4l2_calls.c
diff options
context:
space:
mode:
authorStefan Kost <ensonic@users.sourceforge.net>2006-10-17 13:44:14 +0000
committerStefan Kost <ensonic@users.sourceforge.net>2006-10-17 13:44:14 +0000
commita2b7998dad02e373db08df4cf41afa27d56393a3 (patch)
tree3e58668dcf36e33d9aed399dfc51b2c3d16366a5 /sys/v4l2/v4l2_calls.c
parent2d2802aa8d3810508b00adcad4a886390a90745d (diff)
sys/v4l2/: dear stefan, framespersecond is not frameperiod, reverting but adding comment
Original commit message from CVS: * sys/v4l2/v4l2_calls.c: (gst_v4l2_fill_lists): * sys/v4l2/v4l2src_calls.c: (gst_v4l2src_set_fps), (gst_v4l2src_get_fps): dear stefan, framespersecond is not frameperiod, reverting but adding comment
Diffstat (limited to 'sys/v4l2/v4l2_calls.c')
-rw-r--r--sys/v4l2/v4l2_calls.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/v4l2/v4l2_calls.c b/sys/v4l2/v4l2_calls.c
index baacba0b..8b3c02fd 100644
--- a/sys/v4l2/v4l2_calls.c
+++ b/sys/v4l2/v4l2_calls.c
@@ -153,8 +153,8 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l2object)
GstTunerNorm *norm;
/* fill in defaults */
- standard.frameperiod.numerator = 0;
- standard.frameperiod.denominator = 1;
+ standard.frameperiod.numerator = 1;
+ standard.frameperiod.denominator = 0;
standard.index = n;
if (ioctl (v4l2object->video_fd, VIDIOC_ENUMSTD, &standard) < 0) {
if (errno == EINVAL)
@@ -168,14 +168,14 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l2object)
}
GST_DEBUG_OBJECT (v4l2object->element, " '%s', fps: %d / %d",
- standard.name, standard.frameperiod.numerator,
- standard.frameperiod.denominator);
+ standard.name, standard.frameperiod.denominator,
+ standard.frameperiod.numerator);
v4l2norm = g_object_new (GST_TYPE_V4L2_TUNER_NORM, NULL);
norm = GST_TUNER_NORM (v4l2norm);
norm->label = g_strdup ((const gchar *) standard.name);
gst_value_set_fraction (&norm->framerate,
- standard.frameperiod.numerator, standard.frameperiod.denominator);
+ standard.frameperiod.denominator, standard.frameperiod.numerator);
v4l2norm->index = standard.id;
v4l2object->norms = g_list_append (v4l2object->norms, (gpointer) norm);