From patchwork Tue Mar 31 12:37:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18535 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 2019344B0FC for ; Tue, 31 Mar 2020 15:38:45 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 08E9768B2E0; Tue, 31 Mar 2020 15:38:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 89A0668B135 for ; Tue, 31 Mar 2020 15:38:37 +0300 (EEST) Received: by mail-wr1-f51.google.com with SMTP id p10so25725603wrt.6 for ; Tue, 31 Mar 2020 05:38:37 -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 :mime-version:content-transfer-encoding; bh=XP1ubETjnzpSxnpZ5qv31Js2t215mvREeKmj1pDBZB0=; b=e5d1Lrr1vNL7u606au8TnNhZxYOpWmxp4vkyaigjetciLMTFI4OXUVYCUbOorzuPZ1 Zu+95r6TOt30vuP/VanDvj5VZqjQKN+Xd+Z7TTkaMkbEDOW5DdEUv3s3IyXlyX+Gn56o c0IB9TA1EEqx90YomOL3HizCZC83k1Nhe6wq41t7lAYgFDtMbzQWn/0ANKVBflEIYIZL OJb/h6YkJQGWRUASeWGz5ytM/IsmDfLr+CdUFuI4IExnLTZcWvOTFAWBUfHbP9h0lhZx NtqyNR8wi0gYHKARUhAW1OWSP3LvuAc/sZDl4b0PNjb0mr/M1PRJ8avlRPNz33thwkb6 AZ1g== 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:mime-version:content-transfer-encoding; bh=XP1ubETjnzpSxnpZ5qv31Js2t215mvREeKmj1pDBZB0=; b=ivJf5yMHblW5FOBAZvrQx5XivbeMEKmfbWr2nPyXjkny/qorrT6x8BgAh9vIucBs1L O3oklxNkqvg+Q7n879+GF5g3dtCnXjyKnWLPz4UNXrGmguKENbuFk02j49IaqYeOWYfH W9jGqljSnee2RZfLaPpD+cuD7wjS/5A1kjzAhQuwZBGg1iT6+pomHbWt+AxI0QHQrrka zUsbXuhoqOmNkcMv+lbUTeKtU7XosXIMvazRu6ZzkwrpS/DeR3FyKl5e0s88vzSnbXPm 9FfdaY7NhsRpVTD5+03XtqriIR5WBlHe4dth4wF56e5ilQu6NNFLiOLd/C1YY98s2A6r I6Lg== X-Gm-Message-State: ANhLgQ0GL9RiV0VHjuNKRRsX/tY07Ux/AOmf5wpUeDZ3EHw8/ip7eqeP PgRGsNYM9HLszjQ3aN+ar8ezgIpe X-Google-Smtp-Source: ADFU+vu4Qp+LiNf5lvJtXQq5x4/zNPRMDxm5Zg+PrOBLn+gCQ1ubnrn8IIVkRU5YLrDB3zzTI8IIzg== X-Received: by 2002:adf:ab5a:: with SMTP id r26mr21173022wrc.313.1585658316567; Tue, 31 Mar 2020 05:38:36 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id p13sm26301532wru.3.2020.03.31.05.38.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Mar 2020 05:38:35 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 31 Mar 2020 14:37:44 +0200 Message-Id: <20200331123745.6461-10-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200331123745.6461-1-andreas.rheinhardt@gmail.com> References: <20200331123745.6461-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 09/10] fftools/ffmpeg, doc/examples/remuxing: Remove redundant av_packet_unref 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" av_interleaved_write_frame() already returns blank packets. Signed-off-by: Andreas Rheinhardt --- doc/examples/remuxing.c | 1 - fftools/ffmpeg.c | 1 - 2 files changed, 2 deletions(-) diff --git a/doc/examples/remuxing.c b/doc/examples/remuxing.c index 9e4d1031b4..13469d55ef 100644 --- a/doc/examples/remuxing.c +++ b/doc/examples/remuxing.c @@ -167,7 +167,6 @@ int main(int argc, char **argv) fprintf(stderr, "Error muxing packet\n"); break; } - av_packet_unref(&pkt); } av_write_trailer(ofmt_ctx); diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index aaaf241314..c088d134de 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -827,7 +827,6 @@ static void write_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost, int u main_return_code = 1; close_all_output_streams(ost, MUXER_FINISHED | ENCODER_FINISHED, ENCODER_FINISHED); } - av_packet_unref(pkt); } static void close_output_stream(OutputStream *ost)