mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

compositor/glvideomixer: Don't calculate PAR/DAR with unset GstVideoInfos

Browse source 
Otherwise we divide by zero.
This commit is contained in:
Sebastian Dröge 2015-05-21 16:24:48 +03:00
parent 41c11e3979
commit 3230e51993
2 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ext/gl/gstglvideomixer.c
View file

@ -630,6 +630,15 @@ _mixer_pad_get_output_size (GstGLVideoMixer * mix,
gint pad_width, pad_height; gint pad_width, pad_height;
guint dar_n, dar_d; 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 = pad_width =
mix_pad->width <= mix_pad->width <=
0 ? GST_VIDEO_INFO_WIDTH (&vagg_pad->info) : mix_pad->width; 0 ? GST_VIDEO_INFO_WIDTH (&vagg_pad->info) : mix_pad->width;

9
gst/compositor/compositor.c
View file

@ -223,6 +223,15 @@ _mixer_pad_get_output_size (GstCompositor * comp,
gint pad_width, pad_height; gint pad_width, pad_height;
guint dar_n, dar_d; 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 (comp_pad, "Have no caps yet");
*width = 0;
*height = 0;
return;
}
pad_width = pad_width =
comp_pad->width <= comp_pad->width <=
0 ? GST_VIDEO_INFO_WIDTH (&vagg_pad->info) : comp_pad->width; 0 ? GST_VIDEO_INFO_WIDTH (&vagg_pad->info) : comp_pad->width;