diff options
| author | Edward Hervey <edward.hervey@collabora.co.uk> | 2011-11-25 12:48:58 +0100 |
|---|---|---|
| committer | Edward Hervey <edward.hervey@collabora.co.uk> | 2011-11-25 12:48:58 +0100 |
| commit | b78b980d7236d03378450ac89452dc4ec537824c (patch) | |
| tree | 1a4bbff76ac8020b99f3321afa73eebbb4e9006d /gst/frei0r | |
| parent | c41b5d016cbbe8dc6fa99a377b169e96d24238a9 (diff) | |
| parent | cdcc39455cc92ba5e6988056b03ac9c350a9bb6a (diff) | |
| download | gstreamer-plugins-bad-b78b980d7236d03378450ac89452dc4ec537824c.tar.gz | |
Merge remote-tracking branch 'origin/master' into 0.11
Conflicts:
ext/faac/gstfaac.c
ext/opus/gstopusdec.c
ext/opus/gstopusenc.c
gst/audiovisualizers/gstspacescope.c
gst/colorspace/colorspace.c
Diffstat (limited to 'gst/frei0r')
| -rw-r--r-- | gst/frei0r/gstfrei0r.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gst/frei0r/gstfrei0r.c b/gst/frei0r/gstfrei0r.c index d57c97cd4..5958a2d4d 100644 --- a/gst/frei0r/gstfrei0r.c +++ b/gst/frei0r/gstfrei0r.c @@ -104,7 +104,8 @@ gst_frei0r_klass_install_properties (GObjectClass * gobject_class, case F0R_PARAM_BOOL: g_object_class_install_property (gobject_class, count++, g_param_spec_boolean (prop_name, param_info->name, - param_info->explanation, properties[i].default_value.data.b, + param_info->explanation, + properties[i].default_value.data.b ? TRUE : FALSE, G_PARAM_READWRITE | GST_PARAM_CONTROLLABLE)); properties[i].n_prop_ids = 1; break; |