Merge commit 'e0d01dc7d7fc3ce4c23f286a10870e9599c8b8b9'

* commit 'e0d01dc7d7fc3ce4c23f286a10870e9599c8b8b9':
  smoothstream: check malloc calls

Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavformat/smoothstreamingenc.c

@@ -154,6 +154,8 @@ static void get_private_data(OutputStream *os)
     if (!ptr)
         return;
     os->private_str = av_mallocz(2*size + 1);
+    if (!os->private_str)
+        return;
     for (i = 0; i < size; i++)
         snprintf(&os->private_str[2*i], 3, "%02x", ptr[i]);
     if (ptr != codec->extradata)