projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
366d7ac
)
glmixer: set the current texture to 0 before mapping
author
Matthew Waters
<matthew@centricular.com>
Tue, 5 Apr 2016 06:22:49 +0000
(16:22 +1000)
committer
Tim-Philipp Müller
<tim@centricular.com>
Sat, 9 Dec 2017 19:32:18 +0000
(19:32 +0000)
If we fail mapping, we don't want to use undefined video data in the subclass.
ext/gl/gstglmixer.c
patch
|
blob
|
history
diff --git
a/ext/gl/gstglmixer.c
b/ext/gl/gstglmixer.c
index 7059b4837b4664cfad7d9fe42f094753c3ed9132..3fc7fce2c8df8ae4038472e4d4e6b4d408587c6e 100644
(file)
--- a/
ext/gl/gstglmixer.c
+++ b/
ext/gl/gstglmixer.c
@@
-604,6
+604,7
@@
_upload_frames (GstAggregator * agg, GstAggregatorPad * agg_pad,
GstGLMixerPad *pad = GST_GL_MIXER_PAD (agg_pad);
GstGLMixer *mix = GST_GL_MIXER (agg);
+ pad->current_texture = 0;
if (vaggpad->buffer != NULL) {
GstVideoInfo gl_info;
GstVideoFrame gl_frame;