From patchwork Mon Mar 2 04:44:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 17993 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 19E9A449CCD for ; Mon, 2 Mar 2020 06:45:05 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0B4B568AE75; Mon, 2 Mar 2020 06:45:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DA12E68AA9A for ; Mon, 2 Mar 2020 06:44:57 +0200 (EET) Received: by mail-wm1-f66.google.com with SMTP id p9so9583910wmc.2 for ; Sun, 01 Mar 2020 20:44:57 -0800 (PST) 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=lBdaGsD3s6vJFdOG+KOQfcyfyJ60GXvb0U+/YezWEIw=; b=a6ltnMin9JSONMnWRiijRRfbJVJw4Yu9HZxewpX2PM7rJO++s564o26tP/qLsEFRgm yru0DplVUc+acGAR/uGcpP1MJNDYH/MTUeo3kSaBNdk5U5qMFf/pcvmGxdX/0NqWjwPq rGAt5JXPEsnF2aZX2J99qrh+ag57vw2URPLxVUeMT6ULbdxr32nsozRhaFlIUh0Pi+MT /tSo5Ab4pGGEC/axEpgnH0aO2EGAbln7ApUL+NY9Apos0NzxUtG8G5t33T+whJyK91fg 7GGfODl+bJubopSBPjFOUHuPIEMZcDhUq43W7mejCmRGKPdGmaBptz31sX1QYT++8W1s Li5Q== 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=lBdaGsD3s6vJFdOG+KOQfcyfyJ60GXvb0U+/YezWEIw=; b=MK3Hv4Zwe/ax5E8NdAyGxa3TDQL4l9jjlxx7HmHGuMhBQB71/5jwDU30Vs8FAF5bfL to853e5Bbe1jfepwuHpoycGfrdgC498C8Q8iXIDO0/O9ZayqQzQEkBJdFhJ+ClDgK+Sc JgmDVBmKTimqTa1iqJK0/eWwOM/u0hzCaFkmVnJa1r8loEiqsX4ymsUXw38fPIpYpUlG 27WtpkGVCpxmaC++k7PqKXfamRYZigTAZfo+yz1pCBAdL384oSk7x/pRQBcy8mxlB/EG A68l+BBxI8MPXYtyDOP46JcoD5SJ6n34R/9xKrglWA+/4uTzp8k5Hy4VybwwwC6OlHGt 8Zhw== X-Gm-Message-State: APjAAAU4z0HtNVEM/PxlXDDQcBVPcv5nCfQxdy/Imgc5+IyLXs1sEUVj uwNCcQNcd4BmxaggZxbeq/eSTSfD X-Google-Smtp-Source: APXvYqx5XdK1ShwFIOufbYWbdT8ngx0GBUTRhuqPq1vGsjsK8T23TfOgzWjFBVtEiO+1BQrxk7epSQ== X-Received: by 2002:a05:600c:cd:: with SMTP id u13mr17109320wmm.38.1583124297186; Sun, 01 Mar 2020 20:44:57 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1ab4b.dynamic.kabel-deutschland.de. [188.193.171.75]) by smtp.gmail.com with ESMTPSA id s22sm13130229wmc.16.2020.03.01.20.44.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 01 Mar 2020 20:44:56 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 2 Mar 2020 05:44:34 +0100 Message-Id: <20200302044445.14842-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200302043520.14165-1-andreas.rheinhardt@gmail.com> References: <20200302043520.14165-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 06/17] avformat/webm_chunk: Close IO if writing header fails 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" Signed-off-by: Andreas Rheinhardt --- libavformat/webm_chunk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/webm_chunk.c b/libavformat/webm_chunk.c index 0d4e3598ed..d42f46aab2 100644 --- a/libavformat/webm_chunk.c +++ b/libavformat/webm_chunk.c @@ -150,9 +150,9 @@ static int webm_chunk_write_header(AVFormatContext *s) oc->pb->seekable = 0; ret = oc->oformat->write_header(oc); + ff_format_io_close(s, &oc->pb); if (ret < 0) return ret; - ff_format_io_close(s, &oc->pb); for (i = 0; i < s->nb_streams; i++) { // ms precision is the de-facto standard timescale for mkv files. avpriv_set_pts_info(s->streams[i], 64, 1, 1000);