From patchwork Thu Jul 29 05:25:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 29098 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp5500509ios; Wed, 28 Jul 2021 22:27:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwXGQeWS7anSkBOImo9e19D5Dvq9CbvQ0jOBPwgI0H5kKJPQTYRe1OElxNhBwSSqRQQitAw X-Received: by 2002:a17:906:1c07:: with SMTP id k7mr2858013ejg.173.1627536421729; Wed, 28 Jul 2021 22:27:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627536421; cv=none; d=google.com; s=arc-20160816; b=rLvsbcB9N6sd2dAi/nyQ4ij8plL8WHzYxWcrmEAA/ppC/AoRbncSrb0cuzyDIQazXg YQ1f33YwB+RaBuJXyfPhXPxKToIViTf+QdEAKpu33mRyXmGVU+G490cHbCaWs2WJtTPN 7EKtQK/SUqV4VRJSScOMUuDEVE5ZU1iwss3Tc/YnPKEMsmc+c5t0RMBrOmQOYYP1CugE KOWR1seFDjckGKHPa1aLVYCyic9HW3hLWSeqZ7isw9PkvflY+s1JzQz96zMWlqBpQqYi ccQVOrETjqvr16m8wJev9nfvxnBtHEJlHFyzxRdS2S7dSieTV8A/dHgzA4J602DP8EEy KSeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=+NL2OWmE2xX4i5PEAodKvn9AZaQfkMd2s6eIDH+QJjQ=; b=BLHGaku5Jg5NjdRBpgfiAaIPQ1wZij3bDGPoXP/livdGpiqUh0JajIMjV95ON7GikF 783rMhqwrjtBR9/ADUJhMlE+Tme85pK4nU7YFb9mw+Z3SkaNZ+npk8SXLX5go5/3hBxA kYI1pDl5R0ymhPR1FZMkABxHhLnvkd9HOpkHWVjT3nuz8J6x+hew2aynJom0WDiNFZaU lE3IAC8jOib65O9JXkzzVhVoMvjjyqlRJJURcmh/bnxcfuWVl3AcyP/23UNXgoVQUZB5 hqpkFOp+4GS/wwdl0gzQ3Mh/t0isPOJkk/GIGp1DsViwuh0frql2px/jjXnVC9Xshjpo BWLA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id cm19si1702479edb.410.2021.07.28.22.27.01; Wed, 28 Jul 2021 22:27:01 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7CD3F68A196; Thu, 29 Jul 2021 08:26:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ADB7368A35C for ; Thu, 29 Jul 2021 08:26:07 +0300 (EEST) X-IronPort-AV: E=McAfee;i="6200,9189,10059"; a="210922208" X-IronPort-AV: E=Sophos;i="5.84,278,1620716400"; d="scan'208";a="210922208" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Jul 2021 22:26:04 -0700 X-IronPort-AV: E=Sophos;i="5.84,278,1620716400"; d="scan'208";a="456730170" Received: from xhh-dg164.sh.intel.com ([10.239.159.167]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Jul 2021 22:26:03 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Thu, 29 Jul 2021 13:25:04 +0800 Message-Id: <20210729052509.30992-17-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210729052509.30992-1-haihao.xiang@intel.com> References: <20210729052509.30992-1-haihao.xiang@intel.com> Subject: [FFmpeg-devel] [PATCH v4 16/21] lavfi/vpp_qsv: check output format string against NULL pointer X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Haihao Xiang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: BzQzjnnG7CbD This is in preparation for re-using VPPContext but with a different option array for deinterlacing_qsv filter --- libavfilter/vf_vpp_qsv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/vf_vpp_qsv.c b/libavfilter/vf_vpp_qsv.c index b234417663..704db8fdaf 100644 --- a/libavfilter/vf_vpp_qsv.c +++ b/libavfilter/vf_vpp_qsv.c @@ -234,7 +234,7 @@ static av_cold int vpp_init(AVFilterContext *ctx) { VPPContext *vpp = ctx->priv; - if (!strcmp(vpp->output_format_str, "same")) { + if (!vpp->output_format_str || !strcmp(vpp->output_format_str, "same")) { vpp->out_format = AV_PIX_FMT_NONE; } else { vpp->out_format = av_get_pix_fmt(vpp->output_format_str);