diff options
| author | Wim Taymans <wim.taymans@gmail.com> | 2006-09-27 16:14:18 +0000 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@gmail.com> | 2006-09-27 16:14:18 +0000 |
| commit | 668add505e154984bcba8e7d4a0f7b7b0a3c3358 (patch) | |
| tree | 297291334bc1ecfd766f0cea86fffcda10056cc9 /sys/v4l2/gstv4l2object.c | |
| parent | 0b0c7f16f849d76c033c2e37c4d40ab2be513357 (diff) | |
| download | gst-plugins-bad-668add505e154984bcba8e7d4a0f7b7b0a3c3358.tar.gz gst-plugins-bad-668add505e154984bcba8e7d4a0f7b7b0a3c3358.tar.bz2 gst-plugins-bad-668add505e154984bcba8e7d4a0f7b7b0a3c3358.zip | |
Small cleanups.
Original commit message from CVS:
* sys/v4l2/gstv4l2object.c: (gst_v4l2_object_set_property_helper),
(gst_v4l2_set_defaults):
* sys/v4l2/gstv4l2src.c: (gst_v4l2src_get_read),
(gst_v4l2src_create):
* sys/v4l2/gstv4l2xoverlay.c: (gst_v4l2_xoverlay_open):
* sys/v4l2/v4l2_calls.c: (gst_v4l2_get_capabilities),
(gst_v4l2_fill_lists), (gst_v4l2_open), (gst_v4l2_set_norm),
(gst_v4l2_get_frequency), (gst_v4l2_set_frequency),
(gst_v4l2_signal_strength), (gst_v4l2_get_attribute),
(gst_v4l2_set_attribute), (gst_v4l2_get_input),
(gst_v4l2_set_input):
* sys/v4l2/v4l2src_calls.c: (gst_v4l2src_fill_format_list),
(gst_v4l2src_grab_frame), (gst_v4l2src_get_capture),
(gst_v4l2src_set_capture), (gst_v4l2src_capture_init),
(gst_v4l2src_capture_start), (gst_v4l2src_capture_stop),
(gst_v4l2src_buffer_new):
* tests/icles/v4l2src-test.c: (my_bus_callback), (main):
Small cleanups.
Fix error messages.
Use locks when getting timestamps.
Fix leaks in test.
Add licensing header to tests.
Diffstat (limited to 'sys/v4l2/gstv4l2object.c')
| -rw-r--r-- | sys/v4l2/gstv4l2object.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/sys/v4l2/gstv4l2object.c b/sys/v4l2/gstv4l2object.c index 5d08a6ad..bb834de0 100644 --- a/sys/v4l2/gstv4l2object.c +++ b/sys/v4l2/gstv4l2object.c @@ -308,8 +308,7 @@ gst_v4l2_object_set_property_helper (GstV4l2Object * v4l2object, { switch (prop_id) { case PROP_DEVICE: - if (v4l2object->videodev) - g_free (v4l2object->videodev); + g_free (v4l2object->videodev); v4l2object->videodev = g_value_dup_string (value); break; case PROP_STD: @@ -436,9 +435,7 @@ gst_v4l2_set_defaults (GstV4l2Object * v4l2object) norm = GST_TUNER_NORM (gst_tuner_get_norm (GST_TUNER (v4l2object->element))); if (norm) { - if (v4l2object->std) { - g_free (v4l2object->std); - } + g_free (v4l2object->std); v4l2object->std = g_strdup (norm->label); gst_tuner_norm_changed (tuner, norm); g_object_notify (G_OBJECT (v4l2object->element), "std"); @@ -453,9 +450,7 @@ gst_v4l2_set_defaults (GstV4l2Object * v4l2object) channel = GST_TUNER_CHANNEL (gst_tuner_get_channel (GST_TUNER (v4l2object-> element))); - if (v4l2object->input) { - g_free (v4l2object->input); - } + g_free (v4l2object->input); v4l2object->input = g_strdup (channel->label); gst_tuner_channel_changed (tuner, channel); g_object_notify (G_OBJECT (v4l2object->element), "input"); |