diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-28 12:14:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-28 12:14:26 +0100 |
| commit | 900fff89c9ede6ecd549397384007890fd8c8c6c (patch) | |
| tree | b834396f9fba03d550e6b0eccee9dc0d2c2496ec /libavformat/rtmppkt.c | |
| parent | 42a095d095b597dd855d843138bfda2d4ea36368 (diff) | |
| parent | 44127b157e9f8acb837d4bb3a094f56b40da3ef5 (diff) | |
Merge commit '44127b157e9f8acb837d4bb3a094f56b40da3ef5'
* commit '44127b157e9f8acb837d4bb3a094f56b40da3ef5':
rtmppkt: Make pkt->data reallocable
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtmppkt.c')
| -rw-r--r-- | libavformat/rtmppkt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rtmppkt.c b/libavformat/rtmppkt.c index 92172dc366..4f79487ee0 100644 --- a/libavformat/rtmppkt.c +++ b/libavformat/rtmppkt.c @@ -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); } |