summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Hervey <edward@collabora.com>2012-09-25 14:22:54 +0200
committerEdward Hervey <edward.hervey@collabora.co.uk>2012-11-01 16:43:38 +0100
commite479d2c33db2ca6b99f59ad176b3f3095bc75ce4 (patch)
tree5b32043a60fef42794e077a0cc3712c26e3f65a6
parent094bc36d0ed20b37ad8d2f710eb53ceb969c6987 (diff)
composition: Ensure seeks always have flush/accurate
Otherwise we will never be able to unblock upstream elements
-rw-r--r--gnl/gnlcomposition.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/gnl/gnlcomposition.c b/gnl/gnlcomposition.c
index d35d059..43fb289 100644
--- a/gnl/gnlcomposition.c
+++ b/gnl/gnlcomposition.c
@@ -839,17 +839,15 @@ static GstEvent *
get_new_seek_event (GnlComposition * comp, gboolean initial,
gboolean updatestoponly)
{
- GstSeekFlags flags;
+ GstSeekFlags flags = GST_SEEK_FLAG_ACCURATE | GST_SEEK_FLAG_FLUSH;
gint64 start, stop;
GstSeekType starttype = GST_SEEK_TYPE_SET;
GnlCompositionPrivate *priv = comp->priv;
GST_DEBUG_OBJECT (comp, "initial:%d", initial);
/* remove the seek flag */
- if (!(initial))
- flags = (GstSeekFlags) priv->segment->flags;
- else
- flags = GST_SEEK_FLAG_ACCURATE | GST_SEEK_FLAG_FLUSH;
+ if (!initial)
+ flags |= (GstSeekFlags) priv->segment->flags;
GST_DEBUG_OBJECT (comp,
"private->segment->start:%" GST_TIME_FORMAT " segment_start%"