From patchwork Sun Mar 22 03:47: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: 18329 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 9314044BCD9 for ; Sun, 22 Mar 2020 05:48:47 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7D75768B4CF; Sun, 22 Mar 2020 05:48:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 29E9A68B505 for ; Sun, 22 Mar 2020 05:48:36 +0200 (EET) Received: by mail-wr1-f68.google.com with SMTP id w10so12306046wrm.4 for ; Sat, 21 Mar 2020 20:48:36 -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=Eru00p0zGYxAOAePnAdQkC6xgoZd+uexI0QggvZ5Af8=; b=rgGu3Z7DyFkEdqoX5mY457JqY80xwww9rRW0Old9r8037UWXG7+9e/S3zB5auf+lrl VsPUgs0oEabtTGGlahb/LG1JGl6gQvvlr4nlBwPCZLt7lbZhBEbV2sUZ+jS5uXH3bJ3U BFFbvXzujXNi79A8B6GgmtPxmXI/5MJ7PJV4AJLq6Dv0WjEkuX9KmGoqyRZwX6wBo2tB eoPG2Eg1N2Km/+QJUyy49xtMGbxGKwX5ZPVU0xODtwuAgscWuuyfQGFZF903GO8iKtWI 9mWzycWvghrk43mhOLn2M3vkvnfWCM1ax8UzNn6ls0hUrVM8uMn0iIjrvGTYL715IlUD C58g== 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=Eru00p0zGYxAOAePnAdQkC6xgoZd+uexI0QggvZ5Af8=; b=Tr/bHv4PcLSpxXWMRJAdbMhNPCPJm7d2njEAzLBQGOQ2h8bNjtRH35Bpgqjouagv1F iOm+dJRs/Ku8Gm6AcwDhvNtIhPLCavq8l70tMA+1PGyE8QYWaMpVXCXPxqdGTMD8KTvs 4HTNF88JlMR2xSMz8soLBOQCLfDmBMtqEZgxNJzW9oZNXAmPBLd3gWkJxZ5ZqGjrlVAo JTrBIci+fXkRfTgTIx1zUXtEzcgKEDvPSTsXJvvY5ONXjcX9tlvVZjXGJ3nUm93GByhW r5zCipEiEZnbhqygnzwPIdeBOApUJwcM1hNiRVOYP9SRmbRFRLGdgUlc98UpG+igSjDa 6/BA== X-Gm-Message-State: ANhLgQ272QLRUZrl/33vd6CNsgrcaKXN2UBahMvJwV9v2vystsYnzIzS w+VoIqHxgpBGuQKkCyUWLm1N5g4M X-Google-Smtp-Source: ADFU+vtBzJaJSkK26/CXWyP2WfnFmqiGAC8hJP+GV09r5AhVgC1HFED3kaxApSmB/FYKb9i/DQgYCw== X-Received: by 2002:adf:ef0b:: with SMTP id e11mr21840988wro.115.1584848915349; Sat, 21 Mar 2020 20:48:35 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id k204sm1530371wma.17.2020.03.21.20.48.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Mar 2020 20:48:34 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Mar 2020 04:47:44 +0100 Message-Id: <20200322034756.29907-9-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200322034756.29907-1-andreas.rheinhardt@gmail.com> References: <20200322034756.29907-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 09/21] avformat/nsvdec: Simplify cleanup after read_header failure 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" by setting the FF_INPUTFORMAT_HEADER_CLEANUP flag. Signed-off-by: Andreas Rheinhardt --- libavformat/nsvdec.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/libavformat/nsvdec.c b/libavformat/nsvdec.c index eb26b29450..a0f1d698f7 100644 --- a/libavformat/nsvdec.c +++ b/libavformat/nsvdec.c @@ -211,7 +211,6 @@ static const AVCodecTag nsv_codec_audio_tags[] = { //static int nsv_load_index(AVFormatContext *s); static int nsv_read_chunk(AVFormatContext *s, int fill_header); -static int nsv_read_close(AVFormatContext *s); /* try to find something we recognize, and set the state accordingly */ static int nsv_resync(AVFormatContext *s) @@ -495,30 +494,25 @@ static int nsv_read_header(AVFormatContext *s) for (i = 0; i < NSV_MAX_RESYNC_TRIES; i++) { err = nsv_resync(s); if (err < 0) - goto fail; + return err; if (nsv->state == NSV_FOUND_NSVF) { err = nsv_parse_NSVf_header(s); if (err < 0) - goto fail; + return err; } /* we need the first NSVs also... */ if (nsv->state == NSV_FOUND_NSVS) { err = nsv_parse_NSVs_header(s); if (err < 0) - goto fail; + return err; break; /* we just want the first one */ } } - if (s->nb_streams < 1) { /* no luck so far */ - err = AVERROR_INVALIDDATA; - goto fail; - } + if (s->nb_streams < 1) /* no luck so far */ + return AVERROR_INVALIDDATA; /* now read the first chunk, so we can attempt to decode more info */ err = nsv_read_chunk(s, 1); -fail: - if (err < 0) - nsv_read_close(s); av_log(s, AV_LOG_TRACE, "parsed header\n"); return err; @@ -743,4 +737,5 @@ AVInputFormat ff_nsv_demuxer = { .read_packet = nsv_read_packet, .read_close = nsv_read_close, .read_seek = nsv_read_seek, + .flags_internal = FF_INPUTFORMAT_HEADER_CLEANUP, };