From patchwork Mon Sep 25 01:06:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 5257 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.36.26 with SMTP id f26csp2081837jaa; Sun, 24 Sep 2017 18:08:06 -0700 (PDT) X-Received: by 10.28.25.129 with SMTP id 123mr8549575wmz.17.1506301686815; Sun, 24 Sep 2017 18:08:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506301686; cv=none; d=google.com; s=arc-20160816; b=eMF//I9TifewTz3S3AKx8/9o+qk4DjSVc5tMM67YMToAiRuEZ6Bxq3TdbBzo3NqfA6 TYMvZDxw6zNgy4c7YattZP8+jMACuhD/lQkleTfJ0RZmuhnwene3sH8YliFUjdu3mYE5 zJs1JU1GoON3SGbB50QoR2+dHoOFSUMPUBj9vwtkIOsG80Vial/DTelsGVnnzfrpHRFf Q/84NnDCmOtd8pwhw6ZiyVGZBmm0ZrY7ZHgc+oFfe17CFo5Mez7hYqzH1BMwYuZUmtrj +yuE5zrgQbGw1kf77ZSDaeqM1SSmfmw/wgfcPFcEq4Z4SZYj5pUM4etKqNMssr6r0AcZ tF6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=OmNKaRlfzpO3dSJtf6wvw1S9j0fnT+MnNx7JCTJpKbI=; b=Ob7TPNqGsbcyrOaUlHfPYyOEQ05oNFTdlVxnSRC9No1bLDdhUISKrqvyKHL9EQZd6G ar2PUfe5xgw9l5X6YZFqa/pZ70+hsWly4QDlvfpWYfuCoY1HDI6/MuS7CKL7kdjL2Kt/ CXz+G5qnI559/8+seVBumWaq3WpCWYgDqQxB21Cx+NgF+818M4WKhRZ/q/2YUOLpE2AV 4Jk4oTzefWqHvxLAeeR88WOGr3JhmPryjR7zeGRG9xxSGKIVBsMtsWt5+AEX7K8pU3o3 oJCl12AGcTCF9nH0+ya/f3PEHeKpVhwajJPMgFUkNd4RdRMEUZkLz5kKa3EtHG/3fcfn aqgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=nKzdFRXi; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y17si3987522wrg.369.2017.09.24.18.08.06; Sun, 24 Sep 2017 18:08:06 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=nKzdFRXi; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 78BA7687EC9; Mon, 25 Sep 2017 04:07:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f194.google.com (mail-qk0-f194.google.com [209.85.220.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E5B12680316 for ; Mon, 25 Sep 2017 04:07:30 +0300 (EEST) Received: by mail-qk0-f194.google.com with SMTP id r66so3974068qke.4 for ; Sun, 24 Sep 2017 18:07:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=BiENKLMdCAEtArbNj4mojBHv9qJTqdJPJv2Z1N+SKUw=; b=nKzdFRXi3jz5+bsGgIZ9/6TpBXwtJjvaCuCQNmr8XDYp73CpcM9otevQDkU4BvdrL2 XTQ288shMGSYZ/OUZFjRuLu/ftEde+N1aMy4yVafF93sUg/ZkWE/9lVVuAPM9WO8axgG xa0cosu8iZDlGMYh55vrPW/QbWRQcxJtHGl0bmcGh9KA2//xgYhJ2iB4t2GWHKFI3Mii bUAn8elWGsWy277I6umc3VY4eP/qSMntMj3u/r5O7ZzQF1bouO9AyDhzACShPO/4xbZS AOf9TXjEIerLfmASCV6VwU+Z70zwfp7b6NCRo1tvR8HTH4IsIJ1lxz4472KQZXWYd84o n36A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=BiENKLMdCAEtArbNj4mojBHv9qJTqdJPJv2Z1N+SKUw=; b=DXsYBKFJQpCejFIHZXh9uOLLAIEiuZwxfWX6X8BTcoeFGN8HtZYDpj2tQqSREwo5h8 btyFVjWhGlZNL36fAj4heSgqA1YujOw4x8r3CgAZIXe9+G5a1iP/wGwkoZZ5HJFJ+ed9 hkgju2ofzBIlibwAJ1psBXT9s+xWRAPv9tXPI4vrp3gMMWZLeK2NwRaQSY/FVdTz2TiW ud+hEK4vfOnn1Q0QbxhtV1kEEm8Fv/IDvm498mjLs1IMhxKldzIKsf1DHy4DUXN8YW1W cMO20xhY+mrJQ0K3cm2wCAgI0hWiDsRokvmnyXttZuGrEFlsP+s/uJRX74GL5XM0RXj4 TXQw== X-Gm-Message-State: AHPjjUg+qJ+7ub3bMDe06h48Fte6ML7q/6YOtWmaS4BO6DyFUdOuQWMC nZkzy7UfWxBEthYbov6IdZbzMA== X-Google-Smtp-Source: AOwi7QD74Dn4u86I5q4NuuOTQ0pFU/IUUMRbAdIIW7+kKqQqdCetstu8H3+vjUkK8pUSDqPr1BH+GA== X-Received: by 10.55.24.22 with SMTP id j22mr7728120qkh.310.1506301660314; Sun, 24 Sep 2017 18:07:40 -0700 (PDT) Received: from localhost.localdomain ([181.231.68.242]) by smtp.gmail.com with ESMTPSA id q51sm4250626qtk.18.2017.09.24.18.07.39 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 24 Sep 2017 18:07:39 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Sep 2017 22:06:11 -0300 Message-Id: <20170925010612.9824-3-jamrial@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170925010612.9824-1-jamrial@gmail.com> References: <20170925010612.9824-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/4] avformat/movenc: replace use of av_copy_packet_side_data() 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: James Almer --- libavformat/movenc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index aa0b60c345..0e98b93b2c 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -449,7 +449,8 @@ concatenate: memcpy(info->pkt.data + info->pkt.size - pkt->size, pkt->data, pkt->size); info->num_blocks += num_blocks; info->pkt.duration += pkt->duration; - if ((ret = av_copy_packet_side_data(&info->pkt, pkt)) < 0) + ret = av_packet_copy_side_data(&info->pkt, pkt); + if (ret < 0) return ret; if (info->num_blocks != 6) return 0;