Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / rtmppkt.c

diff --git a/libavformat/rtmppkt.c b/libavformat/rtmppkt.c
index 53c6a5fe19cf5f2013784cb68942084303630f03..4b6d549f74fbc50cb73bf1dec703731321dbb5f0 100644 (file)
--- a/libavformat/rtmppkt.c
+++ b/libavformat/rtmppkt.c
@@ -233,9 +233,11 @@ int ff_rtmp_packet_write(URLContext *h, RTMPPacket *pkt,
 int ff_rtmp_packet_create(RTMPPacket *pkt, int channel_id, RTMPPacketType type,
                           int timestamp, int size)
 {
-    pkt->data = av_malloc(size);
-    if (!pkt->data)
-        return AVERROR(ENOMEM);
+    if (size) {
+        pkt->data = av_malloc(size);
+        if (!pkt->data)
+            return AVERROR(ENOMEM);
+    }
     pkt->data_size  = size;
     pkt->channel_id = channel_id;
     pkt->type       = type;