From patchwork Wed Sep 4 15:27:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 14895 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 AB8B84483B8 for ; Wed, 4 Sep 2019 18:27:29 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8DCC6687F64; Wed, 4 Sep 2019 18:27:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E4D92687F10 for ; Wed, 4 Sep 2019 18:27:22 +0300 (EEST) Received: by mail-pg1-f194.google.com with SMTP id l21so11437986pgm.3 for ; Wed, 04 Sep 2019 08:27:22 -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; bh=o8+nzi2eQnhAmHrBcrVAuEeeM3ELpdd5xtzFSVj2xsk=; b=DQm5JdeSRycmuBXHlx7skRehGGNdsP04YddyPczJtps6bUDuRkzTfurh7mhoKRcZRf NBMODstVpADgwg/2y9909NH2rv5lFGbMQxqqF/dyZJsqE4btdefOrkZ5q3HYJsf4XTLw 9/27I8mtLGR7onAD4jT0psUwgw2gTVPNGO7Y9y+VVHqtavrZzyvYq2ILpjGroKUhgRYi VnFzX52Kb2yY+eY9ZI05ytX3d21GtF3HvQ7qwn2pbgI9YclUl1OlCMTaE7V+2kOdDKt3 wVmYcS9XIju/KCSB2v3OaFKtuO6D3Syv9Uf6rkLNUS4e1Ijw/ixaFYy5O2QIHOlpIkql Xpkw== 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; bh=o8+nzi2eQnhAmHrBcrVAuEeeM3ELpdd5xtzFSVj2xsk=; b=OljuDSe5gLUYqOBOJPGvwXkUIkjH0T34a4FjRz+oBCCVLJCt8Gx1M1UpNvPNHZ/GKc eJVESLUBpb0vcklqm+zJL184Aivr23lIzMVZ/hNijas1noGzhGY2RMmzrC1SnknGKM8r gt5jmUBtPKf5c8EyAFXr9iK5x7+TzyWXN0araaLsOzKn3pZehojWfNX7vjWLzstoZqBX zvl1cC+sKnnEVheP7BTCWMVwIfpXbx9HjGyclo9D2Sl9g3tdPg6WtlYRSQEEYQmQxkzz b1UN86SyWGZsCKI+Dzh6YYJEHYf+4fHQPA71EdDcDxFGwU8oYMmL8sddjz6vkA2ZLvde Ha+w== X-Gm-Message-State: APjAAAW4zfRJD9vzP6LJTELBz+G08cne55M912QMXgfWuLd4sQodMVZG 1bvsDpNlzLIQHL/4lr+7WZd243nX X-Google-Smtp-Source: APXvYqz3QzZQdQKtWXQI4cgvzu9smmnbM+FdBd0hqH9ezexIA/LDpScBsfWH2R0Q2tRXgiOa3Feo6Q== X-Received: by 2002:aa7:8085:: with SMTP id v5mr47209396pff.165.1567610840602; Wed, 04 Sep 2019 08:27:20 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id p189sm11857581pga.2.2019.09.04.08.27.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Sep 2019 08:27:19 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 4 Sep 2019 23:27:10 +0800 Message-Id: <20190904152712.23850-1-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 Subject: [FFmpeg-devel] [PATCH v1 1/3] avcodec/avpacket: 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 --- libavcodec/avpacket.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index 2b20067..34676cb 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -198,8 +198,6 @@ do { \ static int copy_packet_data(AVPacket *pkt, const AVPacket *src, int dup) { pkt->data = NULL; - pkt->side_data = NULL; - pkt->side_data_elems = 0; if (pkt->buf) { AVBufferRef *ref = av_buffer_ref(src->buf); if (!ref) @@ -214,7 +212,7 @@ static int copy_packet_data(AVPacket *pkt, const AVPacket *src, int dup) pkt->side_data_elems = src->side_data_elems; } if (src->side_data_elems && !dup) { - return av_copy_packet_side_data(pkt, src); + return av_packet_copy_props(pkt, src); } return 0;