mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-27 00:38:21 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge branch 'master' into 0.11

Browse source
This commit is contained in:
Wim Taymans 2011-11-10 17:26:12 +01:00
parent 24347217a5 0d47c615ad
commit f8ef57ca48
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gst-libs/gst/audio/gstbaseaudiosink.c
View file

@ -252,9 +252,9 @@ gst_base_audio_sink_class_init (GstBaseAudioSinkClass * klass)
* Since: 0.10.36
*/
g_object_class_install_property (gobject_class, PROP_ALIGNMENT_THRESHOLD,
g_param_spec_int64 ("alignment-threshold", "Alignment Threshold",
g_param_spec_uint64 ("alignment-threshold", "Alignment Threshold",
"Timestamp alignment threshold in nanoseconds", 1,
G_MAXINT64, DEFAULT_ALIGNMENT_THRESHOLD,
G_MAXUINT64 - 1, DEFAULT_ALIGNMENT_THRESHOLD,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/**
@ -266,10 +266,10 @@ gst_base_audio_sink_class_init (GstBaseAudioSinkClass * klass)
* Since: 0.10.36
*/
g_object_class_install_property (gobject_class, PROP_DISCONT_WAIT,
g_param_spec_int64 ("discont-wait", "Discont Wait",
g_param_spec_uint64 ("discont-wait", "Discont Wait",
"Window of time in nanoseconds to wait before "
"creating a discontinuity", 0,
G_MAXINT64, DEFAULT_DISCONT_WAIT,
G_MAXUINT64 - 1, DEFAULT_DISCONT_WAIT,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
gstelement_class->change_state =