virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

avformat/mp3enc: flush buffered packets if referencing fails

Browse Source 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-10-06 15:55:09 -03:00
parent 2a31ad7d60
commit cc5b7601f7
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/mp3enc.c
View File

@ -515,20 +515,15 @@ static int mp3_write_packet(AVFormatContext *s, AVPacket *pkt)
if (mp3->pics_to_write) { if (mp3->pics_to_write) {
/* buffer audio packets until we get all the pictures */ /* buffer audio packets until we get all the pictures */
AVPacketList *pktl = av_mallocz(sizeof(*pktl)); 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"); av_log(s, AV_LOG_WARNING, "Not enough memory to buffer audio. Skipping picture streams\n");
mp3->pics_to_write = 0; mp3->pics_to_write = 0;
mp3_queue_flush(s); mp3_queue_flush(s);
return mp3_write_audio_packet(s, pkt); 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) if (mp3->queue_end)
mp3->queue_end->next = pktl; mp3->queue_end->next = pktl;
else else