diff options
| author | Stefan Sauer <ensonic@users.sf.net> | 2017-10-15 12:14:28 +0200 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2017-12-02 15:10:27 +0000 |
| commit | 656a2616f2cd98adcbc7348f9e070ab3da7a4c60 (patch) | |
| tree | fcaae4486c095e1548be4deada94f0d987913ebe | |
| parent | 5a06c3d12bfc0c8ffbe49df2164547def0f51ece (diff) | |
aggregator: move the comment for the locks to the lock macros
Looks like some code was inserted afterwards.
| -rw-r--r-- | libs/gst/base/gstaggregator.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libs/gst/base/gstaggregator.c b/libs/gst/base/gstaggregator.c index 864654eff..218d30768 100644 --- a/libs/gst/base/gstaggregator.c +++ b/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", \ |