lavf/mp3enc: don't abort if audio packets can't be buffered
authorJames Almer <jamrial@gmail.com>
Wed, 27 Aug 2014 00:31:14 +0000 (21:31 -0300)
committerJames Almer <jamrial@gmail.com>
Wed, 27 Aug 2014 16:51:34 +0000 (13:51 -0300)
Instead skip the picture streams and flush the queued audio packets.
Should address ticket #3851.

Signed-off-by: James Almer <jamrial@gmail.com>
libavformat/mp3enc.c

index c0270c2..7e6b2e1 100644 (file)
@@ -421,8 +421,12 @@ static int mp3_write_packet(AVFormatContext *s, AVPacket *pkt)
             /* buffer audio packets until we get all the pictures */
             AVPacketList *pktl = av_mallocz(sizeof(*pktl));
             int ret;
-            if (!pktl)
-                return AVERROR(ENOMEM);
+            if (!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_copy_packet(&pktl->pkt, pkt);
             if (ret < 0) {