summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian@centricular.com>2014-02-14 12:32:31 +0100
committerSebastian Dröge <sebastian@centricular.com>2014-02-14 12:53:56 +0100
commitae226db5dcd71307a32d3ec505ee6c1db8142265 (patch)
treec88599e350ba4f7e7fccd22f7a2395be87e32190
parentf80874e57b32ba7f13a1f2ecee750ffd1ce91c94 (diff)
downloadgstreamer-plugins-bad-ae226db5dcd71307a32d3ec505ee6c1db8142265.tar.gz
amcvideodec: Store return value of gst_caps_merge_structure()
The inputs are both invalid afterwards.
-rw-r--r--sys/androidmedia/gstamcvideodec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/androidmedia/gstamcvideodec.c b/sys/androidmedia/gstamcvideodec.c
index 7567996fb..9d116491b 100644
--- a/sys/androidmedia/gstamcvideodec.c
+++ b/sys/androidmedia/gstamcvideodec.c
@@ -192,7 +192,7 @@ create_sink_caps (const GstAmcCodecInfo * codec_info)
0, 1, G_MAXINT, 1,
"divxversion", GST_TYPE_INT_RANGE, 3, 5,
"parsed", G_TYPE_BOOLEAN, TRUE, NULL);
- gst_caps_merge_structure (ret, tmp);
+ ret = gst_caps_merge_structure (ret, tmp);
} else if (strcmp (type->mime, "video/3gpp") == 0) {
gint j;
GstStructure *tmp, *tmp2;