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:
d4894ca
)
compositor/glvideomixer: Don't calculate PAR/DAR with unset GstVideoInfos
author
Sebastian Dröge
<sebastian@centricular.com>
Thu, 21 May 2015 13:24:48 +0000
(16:24 +0300)
committer
Tim-Philipp Müller
<tim@centricular.com>
Sat, 9 Dec 2017 19:32:02 +0000
(19:32 +0000)
Otherwise we divide by zero.
ext/gl/gstglvideomixer.c
patch
|
blob
|
history
diff --git
a/ext/gl/gstglvideomixer.c
b/ext/gl/gstglvideomixer.c
index
148c702
..
6ae693d
100644
(file)
--- a/
ext/gl/gstglvideomixer.c
+++ b/
ext/gl/gstglvideomixer.c
@@
-630,6
+630,15
@@
_mixer_pad_get_output_size (GstGLVideoMixer * mix,
gint pad_width, pad_height;
guint dar_n, dar_d;
+ /* FIXME: Anything better we can do here? */
+ if (!vagg_pad->info.finfo
+ || vagg_pad->info.finfo->format == GST_VIDEO_FORMAT_UNKNOWN) {
+ GST_DEBUG_OBJECT (mix_pad, "Have no caps yet");
+ *width = 0;
+ *height = 0;
+ return;
+ }
+
pad_width =
mix_pad->width <=
0 ? GST_VIDEO_INFO_WIDTH (&vagg_pad->info) : mix_pad->width;