From patchwork Wed Sep 4 15:27:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 14897 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 2EED4448828 for ; Wed, 4 Sep 2019 18:34:51 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0E42F687FB1; Wed, 4 Sep 2019 18:34:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7462E687F9D for ; Wed, 4 Sep 2019 18:34:44 +0300 (EEST) Received: by mail-pl1-f193.google.com with SMTP id t11so3647611plo.0 for ; Wed, 04 Sep 2019 08:34:44 -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=U6V1BxA648NynG8PK4q/ftfFYjKx59SmDow8G0plO48=; b=aZGo0Zr0f+AFNgPp2MkzRZgeHh+ScpZ/yhY/mZg2FPwd50918/uiOr6BDv6mxq23Ue ebvpbWCFeBZXkkC9pFBUAM3rzm1EHskL6qnyrD7jfEhTZxhzHX05Qf/4MYxLehqMgKX2 U9T1IZquCN0UD51PEy4YRgpRCNNpISB/+KXIi9fc0NL8KMd15gqAFzENyXXQmCRlR1s+ o0cfsh2DApnkJIHeN4w88ATP8j15ag1/azlQdpulPMfSrlp7Eod+wjjPkd2MhErK+mLe mwqrjga+MuCmqqfRAZupTYQtvesPJn7+tiux6Q1jOnhDsLCWPKoLuFgO5QiBJ2FESN/u ZMXg== 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=U6V1BxA648NynG8PK4q/ftfFYjKx59SmDow8G0plO48=; b=csvdjVC6kxitI4yFDcl1XnYkXiJYbkSJFYlw6MzBRPwTFtfKLaC1arOAgKs62wIQzh 1TZfT09VnEZTz27ZxvizFDagc9ojzCkxmTHpU8BA6Vx8RqvD5IAINk8TCOdUGzWDTADv l4LobNFyVv9uxRxgCkMLOC0ZlqOcI98LcuEQiJElKA3gBEvttCxMqRaRmK1AxXP7vX/c y82YpqCIEA3q6FzZn+ba9T8kBas5ipVmar1Kb1jRhRoAUv3+G2jecpDUMHM6A+z/9331 4KozVzjmr3Oy2jqLsJoloQAipqUcjwOxvrQAuAoo50jHkkEcItQSJlG7iRNAbq6jS54+ yS/g== X-Gm-Message-State: APjAAAXjixhfeA4N9+2n4AMylbDvR4nCgOaBRZkp5o2LlbKTu/XCSsb5 UffO77zNtWcNrYjKHpGsTNxKxBNW X-Google-Smtp-Source: APXvYqynZWetGGz+E0SBEWLfpGAs1vITWqokOrOvZ/CounuvUFO+go/at9Z1kbdBr8WwbBgODZ4BYQ== X-Received: by 2002:a17:902:bd87:: with SMTP id q7mr24950241pls.57.1567610846208; Wed, 04 Sep 2019 08:27:26 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id p189sm11857581pga.2.2019.09.04.08.27.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Sep 2019 08:27:25 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 4 Sep 2019 23:27:11 +0800 Message-Id: <20190904152712.23850-2-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 2/3] fftools/ffmpeg: 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 --- fftools/ffmpeg.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 01f0410..e1a4b4a 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -2004,6 +2004,7 @@ static void do_streamcopy(InputStream *ist, OutputStream *ost, const AVPacket *p output_packet(of, &opkt, ost, 1); return; } + av_packet_copy_props(&opkt, pkt); if ((!ost->frame_number && !(pkt->flags & AV_PKT_FLAG_KEY)) && !ost->copy_initial_nonkeyframes) @@ -2061,8 +2062,6 @@ static void do_streamcopy(InputStream *ist, OutputStream *ost, const AVPacket *p opkt.duration = av_rescale_q(pkt->duration, ist->st->time_base, ost->mux_timebase); - opkt.flags = pkt->flags; - if (pkt->buf) { opkt.buf = av_buffer_ref(pkt->buf); if (!opkt.buf) @@ -2071,8 +2070,6 @@ static void do_streamcopy(InputStream *ist, OutputStream *ost, const AVPacket *p opkt.data = pkt->data; opkt.size = pkt->size; - av_copy_packet_side_data(&opkt, pkt); - output_packet(of, &opkt, ost, 0); }