From: Tim-Philipp Müller <tim.muller@collabora.co.uk>
Date: Sun, 9 Oct 2011 15:29:05 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into 0.11
X-Git-Tag: 1.19.3~509^2~7636
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8c762dabb2430223f56fa7c88427ab406b8582e9;hp=309b5fa0c148d4f69c31ab45ab0c771a55fe9fd5;p=platform%2Fupstream%2Fgstreamer.git

Merge remote-tracking branch 'origin/master' into 0.11
---

diff --git a/gst/isomp4/atomsrecovery.c b/gst/isomp4/atomsrecovery.c
index 5ade82b..8383b66 100644
--- a/gst/isomp4/atomsrecovery.c
+++ b/gst/isomp4/atomsrecovery.c
@@ -122,8 +122,10 @@ atoms_recov_write_ftyp_info (FILE * f, AtomFTYP * ftyp, GstBuffer * prefix)
     return FALSE;
   }
   if (fwrite (data, 1, offset, f) != offset) {
+    g_free (data);
     return FALSE;
   }
+  g_free (data);
   return TRUE;
 }