From patchwork Thu Mar 29 12:59:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Timo_Ter=C3=A4s?= X-Patchwork-Id: 8223 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp1657448jad; Thu, 29 Mar 2018 05:59:44 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+fWhvCV++N4JkhiZ2glHKKAt+orGja6UXmLgdCpw5GixfJguOY2dByx2dtWB/d0qNNCyKM X-Received: by 10.28.178.208 with SMTP id b199mr6187540wmf.125.1522328383963; Thu, 29 Mar 2018 05:59:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522328383; cv=none; d=google.com; s=arc-20160816; b=mlgUqDULmQDzcQr8tMS/AZrh59SrBeEMKIDyt2FIca0Qyh6xB+CyRduyuF5WYWjly9 fapBAxMQHLJ52dIYTXR2O3+FO3P47JtEnKFMHn33zgpjzWKgujlJmAkDifNK5qOWUufG Sc7tfXztGaStjQ7zLCgYToBKyUxzzsMmvTpJZGC9JJMKp+zgQ3/PSFjsiv2t1ACSI3P5 3HlzhaGYajoqooV6qFifdLR+f8pDMYy1VO6o1HV4xjegHecINqRnozXyjE67j7UvLR46 5nnwf496//GtxO8ZFdOuazmKbNc3cSFIULf0ysbsrHWm0MSgykpAax/PX4ZSagv34Zdi etNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :delivered-to:arc-authentication-results; bh=Rbv1TbWmTB/c8VtbQSTv3ZBCRqFCCTHiVN7yP8YhS5Y=; b=o7vFyimnnMnPSUCwrnu+EKJDl8lpBRFg8ZF2piIld0IAI2iM407k8Nu/3nhOq9VrsJ 7IVgcEMTRMTa2JKMu5U0o84JPKftWOpL6icRbFhl9IOzTT7fto2S2A3oNZWtUCHlx0aK /iOLv0FJ4KdYWohwiFxG4mujFOzW55aHJMw8A8p2asFlic5+mQ8Bg2ozDmQV0y+Fdf7n /p1NMoKtj02oiSiX44fKRMDU9vJy+BE41Doy3l+G+V1Mh4vWS+EzkmS4CWA5GbWIF+TH yf5OgoUFFK5jERFmzG0OUqb64ftnnpAL+YPwJxSxy9m8AeXHFYny+f/hWdEomLdmj+ua SPAA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q7si4433846wrg.228.2018.03.29.05.59.43; Thu, 29 Mar 2018 05:59:43 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A1FBE689C8F; Thu, 29 Mar 2018 15:59:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf0-f68.google.com (mail-lf0-f68.google.com [209.85.215.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0F3B8680504 for ; Thu, 29 Mar 2018 15:59:18 +0300 (EEST) Received: by mail-lf0-f68.google.com with SMTP id g203-v6so8263813lfg.11 for ; Thu, 29 Mar 2018 05:59:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=RboOBLk+m21sBJ61Qs81rtv6MdpcoSikQbLol68DI8E=; b=bVLeq2Uw4lKy4+G2DqyIOruRSGSSnqTZPWVduLeNdsLvRGqDLoJ0IibAiQuGS5qNzX 8RBnsY937sDQSQ+oF47ABYK2auX3Vux9xta5l0fGFjImnOAriM53uEIMBqbDUno3JHfr WH8joDfg5efN4Vo8H96o0RC/G5FEJ68Aqk0NSlOstOyn/s3ehHYDOsDWbW+CW1S4E68Z HBgpyKzSI3EQxNp6BDSRJYTvgQJwS+JhyWnGIdsboigzHKJythPvt8ZbMvwzaUJRAEVh XBKcVEee3g/F4r0829HcHt58NQ9EpzebJz0O29+alWNo2/KbbGZJANb+llMB2UCZ+8BZ Bz1g== X-Gm-Message-State: AElRT7GDlKGqBtXKoolXr6UM6WVLdm55W+isuHuu6cBN5sT8CEMkbYsh ThbjGWFTjqIncQQb61S8bdnLHXBO X-Received: by 10.46.134.25 with SMTP id a25mr5295752lji.87.1522328375806; Thu, 29 Mar 2018 05:59:35 -0700 (PDT) Received: from vostro.util.wtbts.net ([2001:1bc8:101:f402:e66f:13ff:fef3:8cd0]) by smtp.gmail.com with ESMTPSA id j8sm1008364lje.83.2018.03.29.05.59.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Mar 2018 05:59:35 -0700 (PDT) From: =?UTF-8?q?Timo=20Ter=C3=A4s?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 29 Mar 2018 15:59:33 +0300 Message-Id: <20180329125933.32642-1-timo.teras@iki.fi> X-Mailer: git-send-email 2.16.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/mov: parse multiple iTunes cover images X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: =?UTF-8?q?Timo=20Ter=C3=A4s?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" 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 --- 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);