From patchwork Wed Jul 1 14:59:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Semashev X-Patchwork-Id: 20760 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 95AD244A559 for ; Wed, 1 Jul 2020 18:27:40 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 70ADE689BD5; Wed, 1 Jul 2020 18:27:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0EC0C688392 for ; Wed, 1 Jul 2020 18:27:34 +0300 (EEST) Received: by mail-ej1-f49.google.com with SMTP id y10so25234051eje.1 for ; Wed, 01 Jul 2020 08:27:34 -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:mime-version :content-transfer-encoding; bh=14eb1bZ+9wF8H2jgY3/EQ8Pd4N7eIMpxVdkjFsmCWyM=; b=Lkvtr625Q8TDDB1NOVPZyIEoJxY1wkRPBczcwpsbo0ZzeFTUocYZU/HA/7O42YgkZz GTVIezDaMkasQAr2D8p1WjWlYKcKxzN4/yo1pU6caj9LOTmBi3Hfba5ph1O/RiR7a6q5 tWjtG3x8vYZiLpTp3xgjt/7cEg7ULwFM3ru4Cf2RNx9a0I2AJ+WcNgSgYgSuu5+4NArU fFlbXxP16f8jUscCXefQMYi/ySr44hBg0dbKABphKV1nMsPm9CWUuC9rrE9Jj9Ef2w9U e+cIPX+9k6M36VhWVy1ml8KD/tKCUpGLVJ5Woixn13IqD71880duc6qWr9JWkHw721D4 sW1Q== 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:mime-version :content-transfer-encoding; bh=14eb1bZ+9wF8H2jgY3/EQ8Pd4N7eIMpxVdkjFsmCWyM=; b=bjND46ZK7qUyTMA9mBLkXr/+pX53gE5+jbJXnvSwMODy9PKCPjN97/ph0eYCTPnPZ/ 8AQmgPMLLaVMdZ7NzTaxZoGhWBgiObBzrq7camWgzyn7iG06MHC0pZGWLnaeJOtB49Ho l64SEUUI3xc3rV34OcLRb67bKNq22rgrnwcPr7Hg88dvRBLZEmu7M3G8LOznODBQ00ll Es75KoV82XR4Of7ftyQ+W/F13OCeWcBB+lVSMJERy3g1IIJLWlanG9UbyU8ru4DAvo9m 2Hki+AYdXONtIt61crFKNpmfcjxpBifhf8SyEQ3DKV4S5zk4yZF5RMSeKV8pxjIZNhnb rhYg== X-Gm-Message-State: AOAM5326xbA1QVWA8yj9Rr7HHizNHvWGT3dCkfQcT2oEdLS6l46sTSxy DqGhF0ExSpFx70r3GU4OQPTjWwIR X-Google-Smtp-Source: ABdhPJwsQ4ZeJKe4JXDq/HfZj37UOI7gQe+kImw1txHcaDYS8AI209YJqVg0f0raCaPkAjjYv+mwMg== X-Received: by 2002:a2e:9b87:: with SMTP id z7mr9874005lji.80.1593615558839; Wed, 01 Jul 2020 07:59:18 -0700 (PDT) Received: from localhost.localdomain (broadband-188-255-20-215.ip.moscow.rt.ru. [188.255.20.215]) by smtp.gmail.com with ESMTPSA id t20sm1921617ljc.2.2020.07.01.07.59.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 07:59:17 -0700 (PDT) From: Andrey Semashev To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Jul 2020 17:59:01 +0300 Message-Id: <20200701145901.49590-1-andrey.semashev@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libavformat/hlsenc: Remove duplicate close of the output stream. 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: Andrey Semashev Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The result of the first close attempt is ignored and may be lost. By removing it we ensure the close result code is properly analyzed. --- libavformat/hlsenc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 71fa3db060..88b58a1ba8 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -2631,7 +2631,6 @@ static int hls_write_trailer(struct AVFormatContext *s) goto failed; vs->size = range_length; - hlsenc_io_close(s, &vs->out, filename); ret = hlsenc_io_close(s, &vs->out, filename); if (ret < 0) { av_log(s, AV_LOG_WARNING, "upload segment failed, will retry with a new http session.\n");