From ac47d20faeba32339e8c7b7d45facb287f54abd2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Olivier=20Cr=C3=AAte?= Date: Mon, 4 Jul 2011 18:03:49 -0400 Subject: [PATCH] x264: Allow renegotiation but prefer current caps --- ext/x264/gstx264enc.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/ext/x264/gstx264enc.c b/ext/x264/gstx264enc.c index 15dd190..f3377bd 100644 --- a/ext/x264/gstx264enc.c +++ b/ext/x264/gstx264enc.c @@ -1655,10 +1655,6 @@ gst_x264_enc_sink_get_caps (GstPad * pad) GstPad *peer; GstCaps *caps; - /* If we already have caps return them */ - if (GST_PAD_CAPS (pad)) - return gst_caps_ref (GST_PAD_CAPS (pad)); - encoder = GST_X264_ENC (gst_pad_get_parent (pad)); if (!encoder) return gst_caps_new_empty (); @@ -1692,6 +1688,14 @@ gst_x264_enc_sink_get_caps (GstPad * pad) caps = gst_caps_copy (gst_pad_get_pad_template_caps (pad)); } + /* If we already have caps return them */ + if (GST_PAD_CAPS (pad) && gst_caps_can_intersect (GST_PAD_CAPS (pad), caps)) { + GstCaps *tmpcaps = gst_caps_copy (GST_PAD_CAPS (pad)); + + gst_caps_merge (tmpcaps, caps); + caps = tmpcaps; + } + gst_object_unref (encoder); return caps; -- 2.7.4