From 1990c45b60cb812f0deca43fffd5b3298f60d0ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Tue, 20 Nov 2012 12:21:08 +0100
Subject: [PATCH] videodecoder: Return the proportion directly

---
 gst-libs/gst/video/gstvideodecoder.c | 17 ++++++++---------
 gst-libs/gst/video/gstvideodecoder.h |  3 +--
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/gst-libs/gst/video/gstvideodecoder.c b/gst-libs/gst/video/gstvideodecoder.c
index 64ef6ad3c3..3481ebc2fc 100644
--- a/gst-libs/gst/video/gstvideodecoder.c
+++ b/gst-libs/gst/video/gstvideodecoder.c
@@ -3161,25 +3161,24 @@ gst_video_decoder_get_max_decode_time (GstVideoDecoder *
 /**
  * gst_video_decoder_get_qos_proportion:
  * @decoder: a #GstVideoDecoder
- * @proportion: (out) (allow-none): address of variable in which to store the
  *     current QoS proportion, or %NULL
  *
- * Returns: TRUE on success
+ * Returns: The current QoS proportion.
  *
  * Since: 1.0.3
  */
-gboolean
-gst_video_decoder_get_qos_proportion (GstVideoDecoder * decoder,
-    gdouble * proportion)
+gdouble
+gst_video_decoder_get_qos_proportion (GstVideoDecoder * decoder)
 {
-  g_return_val_if_fail (GST_IS_VIDEO_DECODER (decoder), FALSE);
+  gdouble proportion;
+
+  g_return_val_if_fail (GST_IS_VIDEO_DECODER (decoder), 1.0);
 
   GST_OBJECT_LOCK (decoder);
-  if (proportion != NULL)
-    *proportion = decoder->priv->proportion;
+  proportion = decoder->priv->proportion;
   GST_OBJECT_UNLOCK (decoder);
 
-  return TRUE;
+  return proportion;
 }
 
 GstFlowReturn
diff --git a/gst-libs/gst/video/gstvideodecoder.h b/gst-libs/gst/video/gstvideodecoder.h
index 074e119997..e5fcacf415 100644
--- a/gst-libs/gst/video/gstvideodecoder.h
+++ b/gst-libs/gst/video/gstvideodecoder.h
@@ -353,8 +353,7 @@ gboolean         gst_video_decoder_negotiate           (GstVideoDecoder * decode
 GstClockTimeDiff gst_video_decoder_get_max_decode_time (GstVideoDecoder *decoder,
 							GstVideoCodecFrame *frame);
 
-gboolean         gst_video_decoder_get_qos_proportion (GstVideoDecoder * decoder,
-                                                       gdouble         * proportion);
+gdouble          gst_video_decoder_get_qos_proportion (GstVideoDecoder * decoder);
 
 GstFlowReturn    gst_video_decoder_finish_frame (GstVideoDecoder *decoder,
 						 GstVideoCodecFrame *frame);