From patchwork Wed Jun 24 23:32:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20598 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 D372B4491EA for ; Thu, 25 Jun 2020 02:33:12 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BA076680A1D; Thu, 25 Jun 2020 02:33:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BEFA26809D1 for ; Thu, 25 Jun 2020 02:33:04 +0300 (EEST) Received: by mail-pl1-f193.google.com with SMTP id bh7so1836946plb.11 for ; Wed, 24 Jun 2020 16:33:04 -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=EgUxNK+uDN/7RQkMfJdq1lcMOtY+/M1REMDKm5J/TVY=; b=j5WhWeRavbmyhCZ7xMTcrzHuRyW+we197P2lKrpiU77aPSMI9MkxAO5wPq1GZ52h0u 3rbKFbU5/ihlOsbznUFsu15g4NWoS4R10SxgWblZ1jyqZIAgk0f0I/xNQubV8zPd3pv8 lI4miXW3ZsPTjO8hF31M3gOOI6Lkd9xdVUEkfu/4T+SSRIYxH4msK2u5cqJ0G3suxHk4 UsR4wFwX55BznnOQlOmTjPsJZpF0vMNrT/w4KvzgPa88Ij9n4FHIbawLWMkMro7wG4Qx J17BxsQ76SH7dseFK7/GZXC7W1viaybayKdNJ2f3Ctp4Qg+4a7S8Ze/OrRem1T00th72 a3sw== 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=EgUxNK+uDN/7RQkMfJdq1lcMOtY+/M1REMDKm5J/TVY=; b=qI3iyTc6SZ/cTkkgKILy1aXkJb3SFLcMUlqsjUPXp+PHtZesr/vFttAmEMYtxp5pWu /rB4aSD7eNtsbUwZULaa+wa5Ku3VGTWwF1gBIXVspx50bXArtyCJIKZHai1WalL3XBjY YaizR03/ygiRkSgQvhu6BKMQq2JnUYscyXzfw3LPfEDY6zacpanw3B+22L5k9KkmkfAl k9SBJl0FGbNjsiDty+B+X40YYjdNfQdcATOujWMgVXT/uz9nTPcnmsxoYdfEA1C+CdIQ U0LrcDDTntb7hI8y+B2n5t38Snljt9ayBiDybvikp5pZ5a4SVpCWVlwmKWansflQXZ+S gmow== X-Gm-Message-State: AOAM530wTQRMHAv/Xs+SutMPjFlE7Ha5jtFHsaxvjdBD18nHILg99/Aq Bp1lOwldZskQWFhgS1MECo/wTdi7 X-Google-Smtp-Source: ABdhPJx6MRvporW7BX9JXPZmx0FJN+sdvTncc+ng11c4BRagVOgkk1/GS1wIr/40eMAxB/I9Uhw9yg== X-Received: by 2002:a17:902:b48a:: with SMTP id y10mr28997122plr.97.1593041582914; Wed, 24 Jun 2020 16:33:02 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id 71sm21646020pfb.20.2020.06.24.16.33.01 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Jun 2020 16:33:02 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 25 Jun 2020 07:32:38 +0800 Message-Id: <1593041559-27350-5-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1593041559-27350-1-git-send-email-lance.lmwang@gmail.com> References: <1592839474-2804-1-git-send-email-lance.lmwang@gmail.com> <1593041559-27350-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v3 5/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. Reviewed-by: Nicolas George 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;