From patchwork Mon Jun 22 15:24:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20554 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 036DE44B9CF for ; Mon, 22 Jun 2020 18:25:08 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E544568B8F1; Mon, 22 Jun 2020 18:25:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2CF6268B8F5 for ; Mon, 22 Jun 2020 18:25:01 +0300 (EEST) Received: by mail-pg1-f196.google.com with SMTP id q22so5435637pgk.2 for ; Mon, 22 Jun 2020 08:25:01 -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; bh=6Ja0lwAiRFC4dgTKEIYSEqQUsc9cQh8qg8ui4SohS3M=; b=AaIvzoWCsBHhbcd4TP5ET6+mwRkECszdA7KPoFCLDdciXHvvDbh2SMkjkcERtEp5z7 aLR7rlJleSwXqS091fIx2LWM9AqVv3Smgry3tvjvfqg1wuYlilvIiHqNA1IAkaOGdtFI 8UMOsPWgDoao25KjkMUK2ZNAXSlqytQNozcnkQVlX82TL2h5m/SbfwpIEoRozLIKIGEN xHvI2KsgXAzX5dbE13CtbFVzF81YOQab9mYVeJP4Bxxz1Hc8H0MhYZc62Hd2L8jowIKX xKL+fTA7R7K1cVBy4YLz7EMMeV/fX5anEzhBQ8WnwzndYiPoyGBsF1qiC+KUIEHaFz+C cLFg== 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; bh=6Ja0lwAiRFC4dgTKEIYSEqQUsc9cQh8qg8ui4SohS3M=; b=coU5ICWZovenHxXc6f9xZvZIlpjsp3V5Amrq/chSy+gwuhLYOXzyNOtRKiLfgHxUvc GNmrnQvEwFZVHhGd0Ba/yE3yPIKyvaEtEiJTDKClNDQ4pMeIF8ZBR56X5BbkdyNGTJBB HUnwObt435Pqj31/Q2Me26A9O6mJHWY9pHidBDcTkHIIlpIV27iY0cn6xmQsb4ldUwFR vnfFCBnU2/13Adc/ZDMlgATzFEOAjfk2keGyHB1090ahEkSKd2IHujaMPwDxHvhTRKsm j81Yz7L+IBg7saybqbuu/Xub7ez0LWdDDXVK/Wyx6+hepGDkTCFkEbIwJ0mEY0efI6yJ fydQ== X-Gm-Message-State: AOAM532bh/y5YpFHsCUZqPEvafMdLpiR+uN2RwuL0qZEew6pH9C7d4RC /h7YOL4nF87fddYW13IdXolol9Iq X-Google-Smtp-Source: ABdhPJyrRr2aXKOlHZ+E15rhLOwfafrtdOETOOKyyZW2fzTIYLaeXel4eCODWmAs6AGqaYKWMm07LA== X-Received: by 2002:a63:1312:: with SMTP id i18mr13470814pgl.142.1592839499507; Mon, 22 Jun 2020 08:24:59 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id n1sm14212314pjn.24.2020.06.22.08.24.58 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Jun 2020 08:24:59 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 22 Jun 2020 23:24:34 +0800 Message-Id: <1592839474-2804-6-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1592839474-2804-1-git-send-email-lance.lmwang@gmail.com> References: <1592839474-2804-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 6/6] avformat/hlsenc: fix av_bprint_finalize() usage 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Don't need to do double check by the description of the API. Signed-off-by: Limin Wang --- libavformat/hlsenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index f7a4f30..a34da2f 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -398,7 +398,7 @@ static int replace_str_data_in_filename(char **s, const char *filename, char pla av_bprint_finalize(&buf, NULL); return AVERROR(ENOMEM); } - if ((ret = av_bprint_finalize(&buf, &new_filename)) < 0 || !new_filename) + if ((ret = av_bprint_finalize(&buf, &new_filename)) < 0) return ret; *s = new_filename; return found_count; @@ -448,7 +448,7 @@ static int replace_int_data_in_filename(char **s, const char *filename, char pla av_bprint_finalize(&buf, NULL); return AVERROR(ENOMEM); } - if ((ret = av_bprint_finalize(&buf, &new_filename)) < 0 || !new_filename) + if ((ret = av_bprint_finalize(&buf, &new_filename)) < 0) return ret; *s = new_filename; return found_count;