diff options
| author | George Kiagiadakis <george.kiagiadakis@collabora.com> | 2015-08-14 18:35:22 +0200 |
|---|---|---|
| committer | George Kiagiadakis <george.kiagiadakis@collabora.com> | 2015-08-14 19:27:07 +0200 |
| commit | c3e4d8ca6fe118869506065e46fee5fe6d5bcacc (patch) | |
| tree | 177eb2330c4ae8510eb05668d7ab52184a9a2a73 | |
| parent | 41cb26b0e9969d2b49c26a259bb3bb8a6e9217d6 (diff) | |
appsink: do not update preroll_caps unless the sink is prerolling
Just for consistency with the preroll_segment
| -rw-r--r-- | gst-libs/gst/app/gstappsink.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gst-libs/gst/app/gstappsink.c b/gst-libs/gst/app/gstappsink.c index c318e1b2f..4850d69db 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; |