From patchwork Mon May 17 03:24:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 27808 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp2458402iof; Sun, 16 May 2021 20:31:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzn/7ab1fRX3qXBylsD47+LpRJQ7QsdBMACpqEiPo9EY3YByaYu7MFh/Z9i8AM9n45KO2DH X-Received: by 2002:a05:6402:3594:: with SMTP id y20mr373152edc.63.1621222267319; Sun, 16 May 2021 20:31:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621222267; cv=none; d=google.com; s=arc-20160816; b=WPikbbqdVfmKca5Z1aLccdrCRT4vjcXHmy7UxL85B0l3wnM0bWbgVs4Xn9y29kFmkT wJyzWUbwcg9GAPQ4SSrThHouX66X5VKir5rfD2nnh7wiMLWQFpNXRUebh7sGciPEfTcp n6jrr/bH8dPLP2SCB2enT+pBy6G+juzkZvrpy7GGWO+/KazOv8pnsfjO+iUsm64KEHbQ wM8tHtjfoKZeGO3gSb2fZvAScakslhPwmq7j5sF60ff7N+hC4I5uVOTNlpR2JrlvVMKr xD8UJ56W7MNG2EEAfuT2ZKFWy5iNRu9KzVHh+zx4w1df4pTE1zbQ1jU7y9JHD4UOGfib 4w6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:ironport-sdr:ironport-sdr:delivered-to; bh=KTCldByLnKg4SJTBqf/sqHXM8r/QOyYPQ8vwZV2u9eA=; b=M85ili+U2Fj83o7ytGyPL4m6jMNIXh4zjB+Cm0V0QzxbOHz10toDkiASABEQJ+SUUG JeRrM9r+LIaheEm9okzmTBpnYrAaVvpTTL0vr5BQDS2eWIlCcBsouc/OfActcEPiIHym 8j/5G9g2HPLmqBqxzP3SVFVraxgg+tkFTMMxr6gXi0/VzBWjDkBAUok3xK8LHANSIZLh 8v9vwgX7d0mv6qX2A2A8fGC2o+xwHCHMactgqinLu08F2SiGWSt4th71ZtbYDWIQH8Z7 9m1lROTRsoUz/ufoZ7DXdQp8QRqUOnMXf8+Nt9cKlSTy/3lgE6ZjzC4L/MNCtb75nbbY 7ebw== 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 gs16si12783356ejc.156.2021.05.16.20.31.07; Sun, 16 May 2021 20:31:07 -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 B559E6899EF; Mon, 17 May 2021 06:28:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E7487689903 for ; Mon, 17 May 2021 06:28:31 +0300 (EEST) IronPort-SDR: rTb0ccK9yx1zD+2Bsx/0VeLZ3nXNT69HHtD/uVCplqyDsD/FCyLpt5ZB+sGUuhEOXE5Tz12PCW DIvDmT0NsR2Q== X-IronPort-AV: E=McAfee;i="6200,9189,9986"; a="187498250" X-IronPort-AV: E=Sophos;i="5.82,306,1613462400"; d="scan'208";a="187498250" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 May 2021 20:28:20 -0700 IronPort-SDR: 3RWs+nH5w1vqkBw/6rJUIoOsfjkQmEKi3FNdeDC0vJ6Fzyxdo+/qULE/XiOIED7MNB8X1/05w6 HXa+o6LY2fDg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,306,1613462400"; d="scan'208";a="626277703" Received: from xhh-tgl64.sh.intel.com ([10.239.159.130]) by fmsmga006.fm.intel.com with ESMTP; 16 May 2021 20:28:19 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 May 2021 11:24:21 +0800 Message-Id: <20210517032426.3376661-18-haihao.xiang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210517032426.3376661-1-haihao.xiang@intel.com> References: <20210517032426.3376661-1-haihao.xiang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 17/22] 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: H0NSKVciWjBf 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 018b0e8689..90b0b25210 100644 --- a/libavfilter/vf_vpp_qsv.c +++ b/libavfilter/vf_vpp_qsv.c @@ -235,7 +235,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);