mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-28 11:10:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

sys/v4l2/gstv4l2element.c: Flag typo.

Browse source 
Original commit message from CVS:
* sys/v4l2/gstv4l2element.c: (gst_v4l2element_get_property):
Flag typo.
* sys/v4l2/v4l2_calls.c: (gst_v4l2_set_defaults):
No warnings.
This commit is contained in:
Ronald S. Bultje 2004-10-24 19:13:58 +00:00
parent ec5fad8ff0
commit 145270dd7e
3 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2004-10-24 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* sys/v4l2/gstv4l2element.c: (gst_v4l2element_get_property):
Flag typo.
* sys/v4l2/v4l2_calls.c: (gst_v4l2_set_defaults):
No warnings.
2004-10-24 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* sys/v4l2/v4l2src_calls.c: (gst_v4l2src_clear_format_list):

2
sys/v4l2/gstv4l2element.c
View file

@ -540,7 +540,7 @@ gst_v4l2element_get_property (GObject * object,
guint flags = 0;
if (GST_V4L2_IS_OPEN (v4l2element)) {
flags |= v4l2element->vcap.capabilities & 30007;
flags |= v4l2element->vcap.capabilities & 0x30007;
}
g_value_set_flags (value, flags);
break;

19
sys/v4l2/v4l2_calls.c
View file

@ -359,15 +359,18 @@ gst_v4l2_set_defaults (GstV4l2Element * v4l2element)
gst_tuner_channel_changed (tuner, channel);
g_object_notify (G_OBJECT (v4l2element), "channel");
}
if (v4l2element->frequency != 0) {
gst_tuner_set_frequency (tuner, channel, v4l2element->frequency);
} else {
v4l2element->frequency = gst_tuner_get_frequency (tuner, channel);
if (v4l2element->frequency == 0) {
/* guess */
gst_tuner_set_frequency (tuner, channel, 1000);
if (GST_TUNER_CHANNEL_HAS_FLAG (channel, GST_TUNER_CHANNEL_FREQUENCY)) {
if (v4l2element->frequency != 0) {
gst_tuner_set_frequency (tuner, channel, v4l2element->frequency);
} else {
g_object_notify (G_OBJECT (v4l2element), "frequency");
v4l2element->frequency = gst_tuner_get_frequency (tuner, channel);
if (v4l2element->frequency == 0) {
/* guess */
gst_tuner_set_frequency (tuner, channel, 1000);
} else {
g_object_notify (G_OBJECT (v4l2element), "frequency");
}
}
}
}