diff options
| author | Stefan Sauer <ensonic@users.sf.net> | 2017-10-15 12:14:28 +0200 |
|---|---|---|
| committer | Stefan Sauer <ensonic@users.sf.net> | 2017-10-15 12:14:28 +0200 |
| commit | 638a4582c2e054d98cb371bd0ad11005dda35cb0 (patch) | |
| tree | 6a3c4f59eda5fcda885c716df8b38e31371199cb /gst-libs | |
| parent | 6deaeec19fb68e303273f11e28352462c16ca7ef (diff) | |
| download | gstreamer-plugins-bad-638a4582c2e054d98cb371bd0ad11005dda35cb0.tar.gz | |
aggregator: move the comment for the locks to the lock macros
Looks like some code was inserted afterwards.
Diffstat (limited to 'gst-libs')
| -rw-r--r-- | gst-libs/gst/base/gstaggregator.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/gst-libs/gst/base/gstaggregator.c b/gst-libs/gst/base/gstaggregator.c index 864654eff..218d30768 100644 --- a/gst-libs/gst/base/gstaggregator.c +++ b/gst-libs/gst/base/gstaggregator.c @@ -106,6 +106,10 @@ static void gst_aggregator_set_latency_property (GstAggregator * agg, gint64 latency); static gint64 gst_aggregator_get_latency_property (GstAggregator * agg); +static GstClockTime gst_aggregator_get_latency_unlocked (GstAggregator * self); + +GST_DEBUG_CATEGORY_STATIC (aggregator_debug); +#define GST_CAT_DEFAULT aggregator_debug /* Locking order, locks in this element must always be taken in this order * @@ -119,12 +123,6 @@ static gint64 gst_aggregator_get_latency_property (GstAggregator * agg); * standard sink pad object lock -> GST_OBJECT_LOCK(aggpad) */ - -static GstClockTime gst_aggregator_get_latency_unlocked (GstAggregator * self); - -GST_DEBUG_CATEGORY_STATIC (aggregator_debug); -#define GST_CAT_DEFAULT aggregator_debug - /* GstAggregatorPad definitions */ #define PAD_LOCK(pad) G_STMT_START { \ GST_TRACE_OBJECT (pad, "Taking PAD lock from thread %p", \ |