From 693dd3cfc4357f55030639f3cdedeb73400a6587 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Fri, 26 Oct 2012 15:23:16 +0200
Subject: [PATCH] media: move unprepare below default implementation

Makes it easier to find the default implementation
---
 gst/rtsp-server/rtsp-media.c | 70 ++++++++++++++++++++++----------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/gst/rtsp-server/rtsp-media.c b/gst/rtsp-server/rtsp-media.c
index 1f216e8..d00a51b 100644
--- a/gst/rtsp-server/rtsp-media.c
+++ b/gst/rtsp-server/rtsp-media.c
@@ -1255,41 +1255,6 @@ state_failed:
   }
 }
 
-/**
- * gst_rtsp_media_unprepare:
- * @media: a #GstRTSPMedia
- *
- * Unprepare @media. After this call, the media should be prepared again before
- * it can be used again. If the media is set to be non-reusable, a new instance
- * must be created.
- *
- * Returns: %TRUE on success.
- */
-gboolean
-gst_rtsp_media_unprepare (GstRTSPMedia * media)
-{
-  gboolean success;
-
-  if (media->status == GST_RTSP_MEDIA_STATUS_UNPREPARED)
-    return TRUE;
-
-  GST_INFO ("unprepare media %p", media);
-  media->target_state = GST_STATE_NULL;
-  success = TRUE;
-
-  if (media->status == GST_RTSP_MEDIA_STATUS_PREPARED) {
-    GstRTSPMediaClass *klass;
-
-    klass = GST_RTSP_MEDIA_GET_CLASS (media);
-    if (klass->unprepare)
-      success = klass->unprepare (media);
-  } else {
-    finish_unprepare (media);
-  }
-
-  return success;
-}
-
 static void
 finish_unprepare (GstRTSPMedia * media)
 {
@@ -1344,6 +1309,41 @@ default_unprepare (GstRTSPMedia * media)
 }
 
 /**
+ * gst_rtsp_media_unprepare:
+ * @media: a #GstRTSPMedia
+ *
+ * Unprepare @media. After this call, the media should be prepared again before
+ * it can be used again. If the media is set to be non-reusable, a new instance
+ * must be created.
+ *
+ * Returns: %TRUE on success.
+ */
+gboolean
+gst_rtsp_media_unprepare (GstRTSPMedia * media)
+{
+  gboolean success;
+
+  if (media->status == GST_RTSP_MEDIA_STATUS_UNPREPARED)
+    return TRUE;
+
+  GST_INFO ("unprepare media %p", media);
+  media->target_state = GST_STATE_NULL;
+  success = TRUE;
+
+  if (media->status == GST_RTSP_MEDIA_STATUS_PREPARED) {
+    GstRTSPMediaClass *klass;
+
+    klass = GST_RTSP_MEDIA_GET_CLASS (media);
+    if (klass->unprepare)
+      success = klass->unprepare (media);
+  } else {
+    finish_unprepare (media);
+  }
+
+  return success;
+}
+
+/**
  * gst_rtsp_media_set_state:
  * @media: a #GstRTSPMedia
  * @state: the target state of the media
-- 
2.7.4