RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavf/mp3enc: don't abort if audio packets can't be buffered 

Instead skip the picture streams and flush the queued audio packets.
Should address ticket #3851.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2014-08-26 21:31:14 -03:00
parent 12df9b9a15
commit d3e9bee6f7
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/mp3enc.c
View File

@ -421,8 +421,12 @@ static int mp3_write_packet(AVFormatContext *s, AVPacket *pkt)
/* 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; int ret;
if (!pktl) if (!pktl) {
return AVERROR(ENOMEM); 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_copy_packet(&pktl->pkt, pkt); ret = av_copy_packet(&pktl->pkt, pkt);
if (ret < 0) { if (ret < 0) {