From: Martin Storsjö <martin@martin.st>
Date: Mon, 24 Nov 2014 08:41:34 +0000 (+0200)
Subject: rtmppkt: Make pkt->data reallocable
X-Git-Tag: android-x86-6.0-r1~10^2~421
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=44127b157e9f8acb837d4bb3a094f56b40da3ef5;p=android-x86%2Fexternal-ffmpeg.git

rtmppkt: Make pkt->data reallocable

We try to avoid mixing av_malloc with av_realloc, since av_malloc
may be implemented with functions that can't (formally) be mixed
with the functions used in av_realloc.

Signed-off-by: Martin Storsjö <martin@martin.st>
---

diff --git a/libavformat/rtmppkt.c b/libavformat/rtmppkt.c
index 37fbb5fc16..e952091714 100644
--- a/libavformat/rtmppkt.c
+++ b/libavformat/rtmppkt.c
@@ -395,7 +395,7 @@ int ff_rtmp_packet_create(RTMPPacket *pkt, int channel_id, RTMPPacketType type,
                           int timestamp, int size)
 {
     if (size) {
-        pkt->data = av_malloc(size);
+        pkt->data = av_realloc(NULL, size);
         if (!pkt->data)
             return AVERROR(ENOMEM);
     }