ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Fri Oct 6 15:55:09 2017 -0300| [cc5b7601f7c2d42b1c874a93277915cfb8c41038] | committer: James Almer
avformat/mp3enc: flush buffered packets if referencing fails Reviewed-by: Michael Niedermayer <mich...@niedermayer.cc> Signed-off-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cc5b7601f7c2d42b1c874a93277915cfb8c41038 --- libavformat/mp3enc.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/libavformat/mp3enc.c b/libavformat/mp3enc.c index 826878eca1..8479e2485b 100644 --- a/libavformat/mp3enc.c +++ b/libavformat/mp3enc.c @@ -515,20 +515,15 @@ static int mp3_write_packet(AVFormatContext *s, AVPacket *pkt) if (mp3->pics_to_write) { /* buffer audio packets until we get all the pictures */ AVPacketList *pktl = av_mallocz(sizeof(*pktl)); - int ret; - if (!pktl) { + + if (!pktl || av_packet_ref(&pktl->pkt, pkt) < 0) { + av_freep(&pktl); av_log(s, AV_LOG_WARNING, "Not enough memory to buffer audio. Skipping picture streams\n"); mp3->pics_to_write = 0; mp3_queue_flush(s); return mp3_write_audio_packet(s, pkt); } - ret = av_packet_ref(&pktl->pkt, pkt); - if (ret < 0) { - av_freep(&pktl); - return ret; - } - if (mp3->queue_end) mp3->queue_end->next = pktl; else _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
