From: George Kiagiadakis <george.kiagiadakis@collabora.com>
Date: Fri, 14 Aug 2015 16:35:22 +0000 (+0200)
Subject: appsink: do not update preroll_caps unless the sink is prerolling
X-Git-Tag: 1.6.0~73
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c3e4d8ca6fe118869506065e46fee5fe6d5bcacc;p=platform%2Fupstream%2Fgst-plugins-base.git

appsink: do not update preroll_caps unless the sink is prerolling

Just for consistency with the preroll_segment
---

diff --git a/gst-libs/gst/app/gstappsink.c b/gst-libs/gst/app/gstappsink.c
index c318e1b..4850d69 100644
--- a/gst-libs/gst/app/gstappsink.c
+++ b/gst-libs/gst/app/gstappsink.c
@@ -554,7 +554,8 @@ gst_app_sink_setcaps (GstBaseSink * sink, GstCaps * caps)
   g_mutex_lock (&priv->mutex);
   GST_DEBUG_OBJECT (appsink, "receiving CAPS");
   g_queue_push_tail (priv->queue, gst_event_new_caps (caps));
-  gst_caps_replace (&priv->preroll_caps, caps);
+  if (!priv->preroll)
+    gst_caps_replace (&priv->preroll_caps, caps);
   g_mutex_unlock (&priv->mutex);
 
   return TRUE;