diff options
author | Matt Oliver <protogonoi@gmail.com> | 2016-01-27 17:16:43 +1100 |
---|---|---|
committer | Matt Oliver <protogonoi@gmail.com> | 2016-01-27 17:16:43 +1100 |
commit | b66ac803fac2394309797193cc3fdd265a285b03 (patch) | |
tree | 690f767c4d6af3d69d6792faae986e214ed2efeb | |
parent | 9079e99d2c462ec7ef2e89d9e77ee6c3553dacce (diff) | |
download | ffmpeg-b66ac803fac2394309797193cc3fdd265a285b03.tar.gz |
avformat/mux: Fix error when writing uncoded frames.
commit "avpacket: Deprecate av_dup_packet" broke the use
av_interleaved_write_uncoded_frame as any input uncoded frame has an
invalid packet size that will crash when av_packet_ref tries to allocate
'size' new memory. Since the packet is a temporary created within mux.c
itself it can be used directly without needing a new ref.
Signed-off-by: Matt Oliver <protogonoi@gmail.com>
-rw-r--r-- | libavformat/mux.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/libavformat/mux.c b/libavformat/mux.c index 2da8cf2287..cf1fb5cc32 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -832,11 +832,15 @@ int ff_interleave_add_packet(AVFormatContext *s, AVPacket *pkt, if ((pkt->flags & AV_PKT_FLAG_UNCODED_FRAME)) { av_assert0(pkt->size == UNCODED_FRAME_PACKET_SIZE); av_assert0(((AVFrame *)pkt->data)->buf); - } - - if ((ret = av_packet_ref(&this_pktl->pkt, pkt)) < 0) { - av_free(this_pktl); - return ret; + this_pktl->pkt = *pkt; + pkt->buf = NULL; + pkt->side_data = NULL; + pkt->side_data_elems = 0; + } else { + if ((ret = av_packet_ref(&this_pktl->pkt, pkt)) < 0) { + av_free(this_pktl); + return ret; + } } if (s->streams[pkt->stream_index]->last_in_packet_buffer) { |