From patchwork Mon May 4 18:22:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19497 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 13B3644AD26 for ; Mon, 4 May 2020 21:23:29 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ECA3B68BE82; Mon, 4 May 2020 21:23:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3796168BDF7 for ; Mon, 4 May 2020 21:23:22 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id k12so560395wmj.3 for ; Mon, 04 May 2020 11:23:22 -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=/GJomPW1tlLRwXf/DK+RzBZDxYr24LZzHVAT3hiwN0A=; b=YyelfejbVABtl+90Q1Sky1Nwwq46PZbE7xV6ffctRi3zs2aS5x41QbgUsR5TIqHE+B QSfekNg23/cB38wyCH+ls/C+5A+e8vrebOlVQ9VkVp6e3vdHcJQRP9vn2lGUdBUsJCje uKR+PEGDj4sSngeqZWZRyVBNJQ3wkbk7h6+NUM1LBhIrY4FUnMheAJ/KgmqLQe6Qwzf7 5VbVRMUhRXtSdz7FMsek6svZdiQm+cggWFglbM6ZPRJhCvlYnWTrn98B+WTYkWG52VKu EnH27fRhHZK2OeiiCQ4h3oJ7w+UdPHXj562TVA06NvZL4JWtfiju2QicgbhM2qBzlnLF T5dw== 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=/GJomPW1tlLRwXf/DK+RzBZDxYr24LZzHVAT3hiwN0A=; b=IXdLobk5b6Msf0tWCvoWCVXC9Xy+hNHA+AC8YZmrQeRKp8B90GqxfEHOai/1NmM1ZS D+6SFrj7aVaHv+dVNb/6hZFct+7bJ4vZDGswYVKuQd0v7CnCDI0LnAgIrbOY23LvFZwx WbhB5HbOc+t2Mb0/kRr9CY6SBOQp7vFemFo+lYaBx44PS11xQL2FtgMYkXVLPcV06jwl AB+0C/Co4B+AOXdVzlGr2jngEEIzLUhVJFwrIALUaJuyoFa6/cy+0S2d7oFkW2SvalKq MbOMmeAn0lGaUwAItgxpT0EekX+0X1RGVTq2bJP/IKQB/DvXFASuc024OJwBgJZsoXCI RXDg== X-Gm-Message-State: AGi0PubMjgig7B7gdv0ypxu5djAsDZpaM5BFawz0jVKiGCyEDfKoyktb nCb7lGP7UgrDlwzDau1JNaj8i6YC X-Google-Smtp-Source: APiQypKzw5BubKRqjlNknJeWiHxXN/4OnzqxPHM8mKKuA0PVxHE7w/m9iYtF7wRkkPInbvJ/GBgo1w== X-Received: by 2002:a7b:c459:: with SMTP id l25mr15654277wmi.52.1588616601200; Mon, 04 May 2020 11:23:21 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id u188sm358595wmg.37.2020.05.04.11.23.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 May 2020 11:23:20 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 May 2020 20:22:43 +0200 Message-Id: <20200504182250.26141-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200504182250.26141-1-andreas.rheinhardt@gmail.com> References: <20200504182250.26141-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 03/10] avformat/nutenc: Add goto fail in nut_write_headers() 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" It allows to combine several ffio_free_dyn_buf(). Signed-off-by: Andreas Rheinhardt --- libavformat/nutenc.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c index 6125429cc3..c1606651fe 100644 --- a/libavformat/nutenc.c +++ b/libavformat/nutenc.c @@ -632,8 +632,7 @@ static int write_headers(AVFormatContext *avctx, AVIOContext *bc) for (i = 0; i < nut->avf->nb_streams; i++) { ret = write_streamheader(avctx, dyn_bc, nut->avf->streams[i], i); if (ret < 0) { - ffio_free_dyn_buf(&dyn_bc); - return ret; + goto fail; } put_packet(nut, bc, dyn_bc, STREAM_STARTCODE); } @@ -646,16 +645,14 @@ static int write_headers(AVFormatContext *avctx, AVIOContext *bc) if (ret > 0) put_packet(nut, bc, dyn_bc, INFO_STARTCODE); else if (ret < 0) { - ffio_free_dyn_buf(&dyn_bc); - return ret; + goto fail; } } for (i = 0; i < nut->avf->nb_chapters; i++) { ret = write_chapter(nut, dyn_bc, i); if (ret < 0) { - ffio_free_dyn_buf(&dyn_bc); - return ret; + goto fail; } put_packet(nut, bc, dyn_bc, INFO_STARTCODE); } @@ -663,9 +660,11 @@ static int write_headers(AVFormatContext *avctx, AVIOContext *bc) nut->last_syncpoint_pos = INT_MIN; nut->header_count++; + ret = 0; +fail: ffio_free_dyn_buf(&dyn_bc); - return 0; + return ret; } static int nut_write_header(AVFormatContext *s)