From bd13c104c2cc1beae7920e0b1e3b6185834a1ef3 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Sun, 11 Mar 2012 19:07:31 +0100 Subject: [PATCH] fix for caps api changes --- ext/ffmpeg/gstffmpegenc.c | 5 +++-- ext/libswscale/gstffmpegscale.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ext/ffmpeg/gstffmpegenc.c b/ext/ffmpeg/gstffmpegenc.c index 9388e0970f..df420a5702 100644 --- a/ext/ffmpeg/gstffmpegenc.c +++ b/ext/ffmpeg/gstffmpegenc.c @@ -315,7 +315,7 @@ gst_ffmpegenc_finalize (GObject * object) static GstCaps * gst_ffmpegenc_get_possible_sizes (GstFFMpegEnc * ffmpegenc, GstPad * pad, - const GstCaps * caps) + GstCaps * caps) { GstCaps *othercaps = NULL; GstCaps *tmpcaps = NULL; @@ -357,7 +357,8 @@ gst_ffmpegenc_get_possible_sizes (GstFFMpegEnc * ffmpegenc, GstPad * pad, gst_structure_set_value (tmps, "height", height); if (framerate) gst_structure_set_value (tmps, "framerate", framerate); - gst_caps_merge_structure (tmpcaps, tmps); + + tmpcaps = gst_caps_merge_structure (tmpcaps, tmps); } gst_caps_unref (intersect); diff --git a/ext/libswscale/gstffmpegscale.c b/ext/libswscale/gstffmpegscale.c index a987f106bf..ae5fb83295 100644 --- a/ext/libswscale/gstffmpegscale.c +++ b/ext/libswscale/gstffmpegscale.c @@ -311,14 +311,14 @@ gst_ffmpegscale_transform_caps (GstBaseTransform * trans, "width", GST_TYPE_INT_RANGE, 1, G_MAXINT, "height", GST_TYPE_INT_RANGE, 1, G_MAXINT, NULL); - gst_caps_merge_structure (ret, gst_structure_copy (structure)); + ret = gst_caps_merge_structure (ret, gst_structure_copy (structure)); /* if pixel aspect ratio, make a range of it */ if ((par = gst_structure_get_value (structure, "pixel-aspect-ratio"))) { gst_structure_set (structure, "pixel-aspect-ratio", GST_TYPE_FRACTION_RANGE, 0, 1, G_MAXINT, 1, NULL); - gst_caps_merge_structure (ret, structure); + ret = gst_caps_merge_structure (ret, structure); } else { gst_structure_free (structure); }