summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLionel Landwerlin <llandwerlin@gmail.com>2015-10-10 18:36:38 +0100
committerLionel Landwerlin <llandwerlin@gmail.com>2015-10-10 18:37:22 +0100
commit2a030f9d61a6888a2378d3cce9b94c5a61946b77 (patch)
tree703f7e08c1e64b14664f7ba9dad508eb49144c98
parente02f37a4001a775ed6f1a7f14da02dbd00fb04f7 (diff)
downloadclutter-gst-2a030f9d61a6888a2378d3cce9b94c5a61946b77.tar.gz
video-sink: delay subtitle upload until the frame is uploaded
https://bugzilla.gnome.org/show_bug.cgi?id=756257
-rw-r--r--clutter-gst/clutter-gst-video-sink.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c
index 0a988c3..25176fa 100644
--- a/clutter-gst/clutter-gst-video-sink.c
+++ b/clutter-gst/clutter-gst-video-sink.c
@@ -2031,8 +2031,6 @@ clutter_gst_source_dispatch (GSource *source,
if (buffer)
{
- clutter_gst_video_sink_upload_overlay (gst_source->sink, buffer);
-
if (gst_buffer_get_video_gl_texture_upload_meta (buffer) != NULL) {
GST_DEBUG_OBJECT (gst_source->sink,
"Trying to upload buffer %p with GL using renderer %s",
@@ -2048,6 +2046,8 @@ clutter_gst_source_dispatch (GSource *source,
goto fail_upload;
}
+ clutter_gst_video_sink_upload_overlay (gst_source->sink, buffer);
+
priv->had_upload_once = TRUE;
gst_buffer_unref (buffer);