From patchwork Tue Jun 15 06:13:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 28300 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp3528199iol; Mon, 14 Jun 2021 23:18:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyL7bRfxfe2PrAd8E0hwl3WVR1M8nxgyqreAQLFMXPscJef1yKD3jg7W0IriU++GnwWPWhM X-Received: by 2002:a17:906:b352:: with SMTP id cd18mr18550424ejb.222.1623737882151; Mon, 14 Jun 2021 23:18:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623737882; cv=none; d=google.com; s=arc-20160816; b=onoUy2Q87aq9s6UjXVdkXZSnu3Vt6fbmc67skDTXgQ5pJ0wlFec1G9bPisQoKP2VC2 3/qBvCQw9CcoeVMcZTRgPwJ0gRzeZKeVnsIyoo/fIOALpR+8MJkedVykQ9Axhrp3I+3J Zl5/bo6lVgsv/kafiM7dxlz4jWjrnyo+WX4XIko3lLMeYdMMwKCc82IjQAiMSaNGK+bL XglFS3ojlMHg1OC0BZz1X2mNOrSrBgCqO7UzyVpK1kTlv0I71ICCSaE9+JdiIQhDk9/3 9VdfXm5ZS8jWqf9b1Ulow0I2CBZQBJMijCctgJ7bnIOLjd27F0tiHWM/I6C2zGc9EN4f hkbw== 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=iGeLGvNa8Y3a45CMQpSEYuIAzcxfa6+oiLx+vSf74fs=; b=GgPZ07g2woTSFOfI6CAgXEjQjflwPqJukjb9eKsb6JHVeTSbbUlVSFKIezd3d0cx+1 iQEm4OtpdnTpHsyPVVT7unS7moj88pbm8vmxIKMt2UVBTjX+pDs7OrXMwaj3ityUTf5+ hq7qRx4EqGAtipg92gMBo2YUhp/cThSIa3mAxHpRb9s/zum9gxQW5n2nrV914GmDTAib 4/pPgvbT+GEJ4I+rtFVlXlv3SrfKN3p4O6Elr+qn4w7uflIV1/3OHDX3GqsLML/kQgBL BAOgnCmAKDPfV6Hz2wVgBAQFQi3d3OYRQP3uMm6lVwaj5BIybP15oLhXnVYvYtz6opv8 m0Ng== 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 j15si5233447edw.0.2021.06.14.23.18.01; Mon, 14 Jun 2021 23:18:02 -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 1D30568003D; Tue, 15 Jun 2021 09:15:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 79523688051 for ; Tue, 15 Jun 2021 09:15:46 +0300 (EEST) IronPort-SDR: bCK/zCBwd0NkkRCJ0GeWMtv/szcMUzS2HnJxv6t9n1ZCiGcIG5jSH45UbxU8DESKOLtqNoWqtt uojUOYTpfKDA== X-IronPort-AV: E=McAfee;i="6200,9189,10015"; a="205750772" X-IronPort-AV: E=Sophos;i="5.83,275,1616482800"; d="scan'208";a="205750772" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jun 2021 23:15:43 -0700 IronPort-SDR: w5Jv05xvg4jJNV87N8w6MpN3iJ4KmG76m8scJD1g4Pjnw7Nm2czPE2Y7MHlWwLSR4M7ozokR2B MzTsrS4Afi9Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,275,1616482800"; d="scan'208";a="451857223" Received: from xhh-tgl64.sh.intel.com ([10.239.159.53]) by fmsmga008.fm.intel.com with ESMTP; 14 Jun 2021 23:15:43 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Jun 2021 14:13:58 +0800 Message-Id: <20210615061403.1576282-18-haihao.xiang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210615061403.1576282-1-haihao.xiang@intel.com> References: <20210615061403.1576282-1-haihao.xiang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 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: B+UhMKaPhKJj 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 cdf1f61b0f..45ac761d06 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);