diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2018-05-06 16:05:28 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2018-05-06 16:05:28 +0200 |
| commit | 4249cb576822b7c21105e596e9c2e83812ffab9b (patch) | |
| tree | f5ccdc13e337fbd6bb1d4ee57ee6cc5fb536926c /gst-libs | |
| parent | e6c80d94f1410e65a8bbac793364c52ca093f9d4 (diff) | |
| download | gstreamer-plugins-bad-4249cb576822b7c21105e596e9c2e83812ffab9b.tar.gz | |
videoaggregator: Rename get_output_buffer() to create_output_buffer()
For consistency with GstAudioAggregator.
Diffstat (limited to 'gst-libs')
| -rw-r--r-- | gst-libs/gst/video/gstvideoaggregator.c | 8 | ||||
| -rw-r--r-- | gst-libs/gst/video/gstvideoaggregator.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/gst-libs/gst/video/gstvideoaggregator.c b/gst-libs/gst/video/gstvideoaggregator.c index 0aafb31ad..5d4a3af41 100644 --- a/gst-libs/gst/video/gstvideoaggregator.c +++ b/gst-libs/gst/video/gstvideoaggregator.c @@ -1582,9 +1582,9 @@ gst_video_aggregator_do_aggregate (GstVideoAggregator * vagg, GstVideoAggregatorClass *vagg_klass = (GstVideoAggregatorClass *) klass; g_assert (vagg_klass->aggregate_frames != NULL); - g_assert (vagg_klass->get_output_buffer != NULL); + g_assert (vagg_klass->create_output_buffer != NULL); - if ((ret = vagg_klass->get_output_buffer (vagg, outbuf)) != GST_FLOW_OK) { + if ((ret = vagg_klass->create_output_buffer (vagg, outbuf)) != GST_FLOW_OK) { GST_WARNING_OBJECT (vagg, "Could not get an output buffer, reason: %s", gst_flow_get_name (ret)); return ret; @@ -2278,7 +2278,7 @@ config_failed: } static GstFlowReturn -gst_video_aggregator_get_output_buffer (GstVideoAggregator * videoaggregator, +gst_video_aggregator_create_output_buffer (GstVideoAggregator * videoaggregator, GstBuffer ** outbuf) { GstAggregator *aggregator = GST_AGGREGATOR (videoaggregator); @@ -2499,7 +2499,7 @@ gst_video_aggregator_class_init (GstVideoAggregatorClass * klass) agg_class->propose_allocation = gst_video_aggregator_propose_allocation; klass->find_best_format = gst_video_aggregator_find_best_format; - klass->get_output_buffer = gst_video_aggregator_get_output_buffer; + klass->create_output_buffer = gst_video_aggregator_create_output_buffer; klass->update_caps = gst_video_aggregator_default_update_caps; /* Register the pad class */ diff --git a/gst-libs/gst/video/gstvideoaggregator.h b/gst-libs/gst/video/gstvideoaggregator.h index 611bd9c56..5926660a1 100644 --- a/gst-libs/gst/video/gstvideoaggregator.h +++ b/gst-libs/gst/video/gstvideoaggregator.h @@ -213,7 +213,7 @@ struct _GstVideoAggregator * or directly use the #GstBuffer from GstVideoAggregatorPad.buffer * if it needs to map the buffer in a special way. The result of the * aggregation should land in @outbuffer. - * @get_output_buffer: Optional. + * @create_output_buffer: Optional. * Lets subclasses provide a #GstBuffer to be used as @outbuffer of * the #aggregate_frames vmethod. * @negotiated_caps: Optional. @@ -231,7 +231,7 @@ struct _GstVideoAggregatorClass GstCaps * caps); GstFlowReturn (*aggregate_frames) (GstVideoAggregator * videoaggregator, GstBuffer * outbuffer); - GstFlowReturn (*get_output_buffer) (GstVideoAggregator * videoaggregator, + GstFlowReturn (*create_output_buffer) (GstVideoAggregator * videoaggregator, GstBuffer ** outbuffer); void (*find_best_format) (GstVideoAggregator * vagg, GstCaps * downstream_caps, |