From patchwork Tue Sep 10 11:39:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 15000 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 64A86440291 for ; Tue, 10 Sep 2019 14:39:51 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 539A8687FE9; Tue, 10 Sep 2019 14:39:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 74F16687FEE for ; Tue, 10 Sep 2019 14:39:44 +0300 (EEST) Received: by mail-pl1-f175.google.com with SMTP id t1so8454705plq.13 for ; Tue, 10 Sep 2019 04:39: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=/mcpqTyxZ7R5pDk1CtW6Dyar5cCqitrZngYV+p3ZEKM=; b=hV4+Sw8qPOo1inwnq1VgjfyqYlpF6yvfd75F1sPkoaP2aTe+pEwvHkIElbOOBMw77G XSpYaZIePWnEaCQCnMcwW74XneYoJj3LPf/TD/GxnMHm8J6VpJdNCZeWhySD35wuG56R JTuTZ9Lo4WIoPJ4SI+1UmYjR7NJaVgp+SBkyzLAPsjzKlQhpJ3qHwOGQkVxkvBoA02v4 KQ0yC0ZxTWzu/nUQgJ3JzA3eKP2eCkmx51KfvWRVjTStL0ABjZwhsSEHaZEaKnWpAdfa QkyyXIyx1FxIAgfbC4MZdu+MN5U4x7ZUnHs9x8xMocEI/6b1SE1qzy42LW+JLNURXWN7 5DQg== 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=/mcpqTyxZ7R5pDk1CtW6Dyar5cCqitrZngYV+p3ZEKM=; b=IznTQzwAIhGEDA0a5j8GGUG3rWwbTCzcfN5tU7CDxz+QCHObZnBHpyOHoGMWObaSpq khvJ+frZmx5jikWBj80A5r5ZbaCgc5x7Pamrswf8E29dIs39w8gy1sVKbOKgFhPdSsSD xCreliYi7ryFH8aAj9v+d02SR5K3VF5J8UclyJ/KliuoD7YitT/cZUY6tlGtqRaHm+kt DMjnBCvznsHD8VetIdQ2miFlQCbiMxxTkUQIyAEcpkYCjwHyvRwEBBxruIpHNcBa0A+b YPpFlTo0guOOdXC52Ovv7j27bEc5Rygt275m8ZQfOZt5YArCpIeRoIVBrMV1sGcz1IJA ntgw== X-Gm-Message-State: APjAAAWreoLOom/2lDFnHACDn+9Er8N7Z4laaRqBwog11L7GJBVT702l Zw8l20rbe3KZDdTyzXoimljG95m5 X-Google-Smtp-Source: APXvYqyUDNQi0ivMaTWRHR6tav/yVclRkkAcNRAuiW4bAcX1tdY2HvQDJbf2o74izQB0A7NYyTWnJA== X-Received: by 2002:a17:902:426:: with SMTP id 35mr31133267ple.192.1568115582873; Tue, 10 Sep 2019 04:39:42 -0700 (PDT) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id v18sm18187749pfn.24.2019.09.10.04.39.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Sep 2019 04:39:42 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Sep 2019 19:39:28 +0800 Message-Id: <1568115568-14548-4-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1568115568-14548-1-git-send-email-mypopydev@gmail.com> References: <1568115568-14548-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH V1 4/4] lavf/mux: remove unnecessary packet reset 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao remove unnecessary packet reset in av_interleaved_write_frame Signed-off-by: Jun Zhao --- libavformat/mux.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/libavformat/mux.c b/libavformat/mux.c index 0227c0d..9bac252 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -1227,11 +1227,9 @@ int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt) for (;; ) { AVPacket opkt; int ret = interleave_packet(s, &opkt, pkt, flush); - if (pkt) { - memset(pkt, 0, sizeof(*pkt)); - av_init_packet(pkt); + if (pkt) pkt = NULL; - } + if (ret <= 0) //FIXME cleanup needed for ret<0 ? return ret;