diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-03-11 19:06:59 +0100 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-03-11 19:06:59 +0100 |
| commit | 77299ba6aeb30a80b4ce9fc1fffd5e1c98c0842a (patch) | |
| tree | 260b936d9a08939e0ac39165ffeb328cb6791fe5 /gst-libs | |
| parent | 857a9564f1992829655d4648898e069889f51844 (diff) | |
| download | gstreamer-plugins-bad-77299ba6aeb30a80b4ce9fc1fffd5e1c98c0842a.tar.gz | |
fix for caps api changes
Diffstat (limited to 'gst-libs')
| -rw-r--r-- | gst-libs/gst/video/gstbasevideoencoder.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gst-libs/gst/video/gstbasevideoencoder.c b/gst-libs/gst/video/gstbasevideoencoder.c index 3f38c298b..6b1cfb0fb 100644 --- a/gst-libs/gst/video/gstbasevideoencoder.c +++ b/gst-libs/gst/video/gstbasevideoencoder.c @@ -384,7 +384,7 @@ static GstCaps * gst_base_video_encoder_sink_getcaps (GstPad * pad, GstCaps * filter) { GstBaseVideoEncoder *base_video_encoder; - const GstCaps *templ_caps; + GstCaps *templ_caps; GstCaps *allowed; GstCaps *fcaps, *filter_caps; gint i, j; @@ -403,7 +403,7 @@ gst_base_video_encoder_sink_getcaps (GstPad * pad, GstCaps * filter) gst_pad_get_allowed_caps (GST_BASE_VIDEO_CODEC_SRC_PAD (base_video_encoder)); if (!allowed || gst_caps_is_empty (allowed) || gst_caps_is_any (allowed)) { - fcaps = gst_caps_copy (templ_caps); + fcaps = templ_caps; goto done; } @@ -432,7 +432,7 @@ gst_base_video_encoder_sink_getcaps (GstPad * pad, GstCaps * filter) if ((val = gst_structure_get_value (allowed_s, "pixel-aspect-ratio"))) gst_structure_set_value (s, "pixel-aspect-ratio", val); - gst_caps_merge_structure (filter_caps, s); + filter_caps = gst_caps_merge_structure (filter_caps, s); } } @@ -440,6 +440,7 @@ gst_base_video_encoder_sink_getcaps (GstPad * pad, GstCaps * filter) filter_caps); fcaps = gst_caps_intersect (filter_caps, templ_caps); + gst_caps_unref (templ_caps); gst_caps_unref (filter_caps); if (filter) { |