From patchwork Wed Sep 4 15:27:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 14896 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id C12764483B8 for ; Wed, 4 Sep 2019 18:27:37 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A1ADC687FA2; Wed, 4 Sep 2019 18:27:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A3719687FA2 for ; Wed, 4 Sep 2019 18:27:30 +0300 (EEST) Received: by mail-pl1-f180.google.com with SMTP id y10so3808703pll.7 for ; Wed, 04 Sep 2019 08:27:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NAbai2Urq/qFJJ08OYYoyyGKdx1gEcjvvUu0mnYPR8s=; b=dj1YrpFvdvcxhhLH/7urNSMeURZcF+l5iXI/FsZl5pvEgc5i4AL8bT7+yaZgR9w1xt THwPJWsKgs5yDBMjv711yMZcoRGZIEuOKimIsdRsZGfhCUI1mJy9JAaBvV0g7TFIp92L xy2Xt8iEYHftKz2d+Y556BatcxEdlTVbOjKdXmfI/GNvLjR1K5+j52//x5PozPo62vFp 5y/+rQXnB2NKC//bW5WGdW0KUQm6rKtfpKhpPn8eX9qIsX2dQy/mai+/8vyQTLlHekF5 EKqocFWN7GFvi9pAmAPMcluImcnsgVrti+oJqVLMeuduUONLwK51vVz4W/DGSv2pGuyB KiIQ== 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:in-reply-to :references; bh=NAbai2Urq/qFJJ08OYYoyyGKdx1gEcjvvUu0mnYPR8s=; b=VjyaV4hqQ3OhEHSo3Ko1b9TTTGInUoR51KXcYZHDTHNFXAexeBtfA739alvMiCOMrp DHAENGrfB5wrx/kHZAqhB0xxxR9wr+mhfHGOd4EI6w2QHKuC9Nm2dvU5TSW4szlPbNEF GnBRCRmkIPubBwMT2ZzdnCQ2xb4m5KhaQVWHh31fpAXEjD0hrOGCi0b6Dh1MtNEqw9D9 CnI37m43Ne+4c+XVA1mn/VCd3FfJyNN+8tn8DyrVDqjXLfpV8MjlQ7QSvSJjhsRv4EDU ausTg6whnS8G9atKcRa8HPi4QBZy21sLb0DGqqekSu6A7/ASxwgqWtC7xrq8XE0WdFly smyg== X-Gm-Message-State: APjAAAXCY2kaV0L2yQp4IDj+zqnRQdmy+J4kxt4E78eqm+NTmYz7H/2q d5FxnSJxW1czlE4kVp57inXtUGKR X-Google-Smtp-Source: APXvYqwm8I+6RNsVgwWP6TAZmWaQ8u7OTLMSfOUsgB1ybv3Sl1CXL5JalfOrWXsdMBPJOaU/78U+sA== X-Received: by 2002:a17:902:864a:: with SMTP id y10mr4884123plt.294.1567610849076; Wed, 04 Sep 2019 08:27:29 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id p189sm11857581pga.2.2019.09.04.08.27.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Sep 2019 08:27:28 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 4 Sep 2019 23:27:12 +0800 Message-Id: <20190904152712.23850-3-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20190904152712.23850-1-lance.lmwang@gmail.com> References: <20190904152712.23850-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v1 3/3] avformat/movenc: replace the deprecated 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 Cc: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavformat/movenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index edddfee..503f099 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -518,7 +518,7 @@ 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) + if ((ret = av_packet_copy_props(&info->pkt, pkt)) < 0) goto end; if (info->num_blocks != 6) goto end;