Instead skip the picture streams and flush the queued audio packets.
Should address ticket #3851.
Signed-off-by: James Almer <jamr...@gmail.com>
---
This is more a workaround than a "fix" to the issue, with the intent of
not aborting the entire muxing process just because a picture couldn't
be written to the id3v2 tag.
libavformat/mp3enc.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/libavformat/mp3enc.c b/libavformat/mp3enc.c
index c0270c2..7e6b2e1 100644
--- a/libavformat/mp3enc.c
+++ b/libavformat/mp3enc.c
@@ -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) {
--
1.8.5.5
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
