mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-27 12:11:13 +00:00
Merge branch 'master' into 0.11
This commit is contained in:
commit
ebf502d1c6
1 changed files with 2 additions and 3 deletions
|
@ -2370,12 +2370,11 @@ push:
|
||||||
}
|
}
|
||||||
seen_key = FALSE;
|
seen_key = FALSE;
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
seen_delta = TRUE;
|
seen_delta = TRUE;
|
||||||
|
} else {
|
||||||
|
seen_key = TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
seen_key |= !GST_BUFFER_FLAG_IS_SET (buf, GST_BUFFER_FLAG_DELTA_UNIT);
|
|
||||||
|
|
||||||
parse->priv->buffers_send =
|
parse->priv->buffers_send =
|
||||||
g_slist_prepend (parse->priv->buffers_send, buf);
|
g_slist_prepend (parse->priv->buffers_send, buf);
|
||||||
parse->priv->buffers_queued =
|
parse->priv->buffers_queued =
|
||||||
|
|
Loading…
Reference in a new issue