From cea218db6f6e3aa06b3b766fe5d459bd309cc070 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Fri, 14 Feb 2014 12:32:31 +0100
Subject: [PATCH] amcvideodec: Store return value of gst_caps_merge_structure()

The inputs are both invalid afterwards.
---
 sys/androidmedia/gstamcvideodec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/androidmedia/gstamcvideodec.c b/sys/androidmedia/gstamcvideodec.c
index 6e383d3eab..00b237a594 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;