mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

x264: Allow renegotiation but prefer current caps

Browse source
This commit is contained in:
Olivier Crête 2011-07-04 18:03:49 -04:00
parent e595cdc311
commit ac47d20fae
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ext/x264/gstx264enc.c
View file

@ -1655,10 +1655,6 @@ gst_x264_enc_sink_get_caps (GstPad * pad)
GstPad *peer; GstPad *peer;
GstCaps *caps; 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)); encoder = GST_X264_ENC (gst_pad_get_parent (pad));
if (!encoder) if (!encoder)
return gst_caps_new_empty (); 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)); 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); gst_object_unref (encoder);
return caps; return caps;