Merge commit '44127b157e9f8acb837d4bb3a094f56b40da3ef5'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Nov 2014 11:14:10 +0000 (12:14 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Nov 2014 11:14:26 +0000 (12:14 +0100)
* commit '44127b157e9f8acb837d4bb3a094f56b40da3ef5':
  rtmppkt: Make pkt->data reallocable

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/rtmppkt.c

index 92172dc..4f79487 100644 (file)
@@ -396,7 +396,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);
     }