From patchwork Sun Mar 22 03:47:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18328 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 9CD9944BCD9 for ; Sun, 22 Mar 2020 05:48:46 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8C21E68B573; Sun, 22 Mar 2020 05:48:46 +0200 (EET) 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 D140A68B49C for ; Sun, 22 Mar 2020 05:48:40 +0200 (EET) Received: by mail-wm1-f67.google.com with SMTP id g62so10649901wme.1 for ; Sat, 21 Mar 2020 20:48:40 -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=ZSp8QoftobIG8K/bFWcHjIOXCt0pFBA6q2ZA7o6rbcI=; b=k54eckBshRRPqVKCHlckUWq64UezDbDKq2gGS4svpdKibmGZO5ri24PS7S5Ss+em1/ mEa/PPI9flAobQ3xK6nwhorBZ/MBj2s3SGnyOi01A/kSDc1crWNfZdcHTiZdBVh/hBWV CNFSK7cBn8+2HX59GLRC1EeXwNqvW44YX+bTPnB5JxFEAhGNa6pYooQxgWd2ZjzsxopF ccL1mA/wHxfbVJ5DtmfCBLHdiW4aoLvLs49zm60tyoYCQ9n0DIYxB7larbNmjz1CT5YC ozt+1ChwKT+MSgvTPxarNl69Q2fSXeuZYSTPTIH/jEPw1lcL1oCM4HerCpHZgCMCUiV5 OudQ== 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=ZSp8QoftobIG8K/bFWcHjIOXCt0pFBA6q2ZA7o6rbcI=; b=O0Do2vDHnxXpVapAhSXSNbRDchbIdxIROZ3qB9Ci3Wfqg1K4Li/vJ/jTH95g3Q6Xwe wBxEZLSFPoJt2kCZTVuZXpXZrcRSF0BWWjnBlf7nuJ/yQfS8mbhTTHAQHARe97X/SBQm byZZpOrSQJGyXzR1TrQEA7tZySGhyd5ihVHCrB8sWle4t1b4HlHBMkoO81YNd9xiBG1w TBQnE1y8CsRyyQjtkGugMlmiWVyA+WsxIYmkIJTJYBS0pfEi411lB+5P6nVsDMiOc9rB ru93GK1jTxm0yQSVsDjERLwEL6F1VbsbVV8WWXjn6ir8pJ3x2KoMa7UjSIYtmxqdjCos 7M/Q== X-Gm-Message-State: ANhLgQ0WXkk3o2C4UiwhzvrELxn+/VdYGEHh9+ZYZNVu4bw2vItKnPbg eiMpwpqOhpexY+EuXPDzmxu3F1Ud X-Google-Smtp-Source: ADFU+vu0a7RXW+GqlxJvqhqBjY+guw0P1r4uSe8+j9xGpjW2V95WPV9tluG8xPJXhgOS/wUkbjtBXw== X-Received: by 2002:a05:600c:286:: with SMTP id 6mr19348277wmk.101.1584848919858; Sat, 21 Mar 2020 20:48:39 -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.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Mar 2020 20:48:39 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 Mar 2020 04:47:48 +0100 Message-Id: <20200322034756.29907-13-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 13/21] avformat/av1dec: Simplify cleanup after read_header error 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/av1dec.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/libavformat/av1dec.c b/libavformat/av1dec.c index 1be2fac1c1..3bf7b598a0 100644 --- a/libavformat/av1dec.c +++ b/libavformat/av1dec.c @@ -174,16 +174,10 @@ static int annexb_read_header(AVFormatContext *s) return ret; ret = avcodec_parameters_copy(c->bsf->par_in, st->codecpar); - if (ret < 0) { - av_bsf_free(&c->bsf); - return ret; - } - - ret = av_bsf_init(c->bsf); if (ret < 0) - av_bsf_free(&c->bsf); + return ret; - return ret; + return av_bsf_init(c->bsf); } static int annexb_read_packet(AVFormatContext *s, AVPacket *pkt) @@ -276,4 +270,5 @@ AVInputFormat ff_av1_demuxer = { .extensions = "obu", .flags = AVFMT_GENERIC_INDEX, .priv_class = &annexb_demuxer_class, + .flags_internal = FF_INPUTFORMAT_HEADER_CLEANUP, };