mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-03-13 23:22:54 +00:00
Merge branch 'master' into 0.11
This commit is contained in:
commit
f8ef57ca48
1 changed files with 4 additions and 4 deletions
|
@ -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 =
|
||||
|
|
Loading…
Reference in a new issue