Message ID | 20180329125933.32642-1-timo.teras@iki.fi |
---|---|
State | Accepted |
Commit | 8c980b1c92bbc98ed12b6a43269572aaacf31426 |
Headers | show |
On Thu, Mar 29, 2018 at 03:59:33PM +0300, Timo Teräs wrote: > 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 <timo.teras@iki.fi> > --- > libavformat/mov.c | 4 ++++ > 1 file changed, 4 insertions(+) should be ok, will apply after some tests thx [...]
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);
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 <timo.teras@iki.fi> --- libavformat/mov.c | 4 ++++ 1 file changed, 4 insertions(+)