From 9e9cf013493d4a3c01fe35a1f7e993022a32e3f7 Mon Sep 17 00:00:00 2001 From: Tim-Philipp Müller Date: Fri, 29 Nov 2013 15:49:29 +0000 Subject: x264enc: fix crash on NULL caps when negotiation happens without a downstream peer gst-launch-1.0 videotestsrc ! x264enc --- ext/x264/gstx264enc.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'ext/x264/gstx264enc.c') diff --git a/ext/x264/gstx264enc.c b/ext/x264/gstx264enc.c index 5fc5e121..8ec88b3d 100644 --- a/ext/x264/gstx264enc.c +++ b/ext/x264/gstx264enc.c @@ -1552,6 +1552,10 @@ gst_x264_enc_set_profile_and_level (GstX264Enc * encoder, GstCaps * caps) profile = gst_structure_get_string (s, "profile"); allowed_caps = gst_pad_get_allowed_caps (GST_VIDEO_ENCODER_SRC_PAD (encoder)); + + if (allowed_caps == NULL) + goto no_peer; + if (!gst_caps_can_intersect (allowed_caps, caps)) { allowed_caps = gst_caps_make_writable (allowed_caps); allowed_caps = gst_caps_truncate (allowed_caps); @@ -1581,6 +1585,8 @@ gst_x264_enc_set_profile_and_level (GstX264Enc * encoder, GstCaps * caps) } gst_caps_unref (allowed_caps); +no_peer: + return TRUE; } -- cgit v1.2.3