appsink: do not update preroll_caps unless the sink is prerolling
authorGeorge Kiagiadakis <george.kiagiadakis@collabora.com>
Fri, 14 Aug 2015 16:35:22 +0000 (18:35 +0200)
committerGeorge Kiagiadakis <george.kiagiadakis@collabora.com>
Fri, 14 Aug 2015 17:27:07 +0000 (19:27 +0200)
Just for consistency with the preroll_segment

gst-libs/gst/app/gstappsink.c

index c318e1b..4850d69 100644 (file)
@@ -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;