From 8c980b1c92bbc98ed12b6a43269572aaacf31426 Mon Sep 17 00:00:00 2001 From: Timo Teräs Date: Thu, 29 Mar 2018 15:59:33 +0300 Subject: avformat/mov: parse multiple iTunes cover images MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Multiple cover images are supported by having multiple data atoms inside the covr atom. AtomicParsley and mutagen amongst others support and document this construct. Signed-off-by: Timo Teräs Signed-off-by: Michael Niedermayer --- libavformat/mov.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index cb6f3a45de..e7c32e6148 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -412,7 +412,11 @@ retry: int ret = mov_read_covr(c, pb, data_type, str_size); if (ret < 0) { av_log(c->fc, AV_LOG_ERROR, "Error parsing cover art.\n"); + return ret; } + atom.size -= str_size; + if (atom.size > 8) + goto retry; return ret; } else if (!key && c->found_hdlr_mdta && c->meta_keys) { uint32_t index = AV_RB32(&atom.type); -- cgit v1.2.3