From patchwork Mon Jan 9 07:12:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 39935 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp2884395pzb; Sun, 8 Jan 2023 23:13:37 -0800 (PST) X-Google-Smtp-Source: AMrXdXvhPqt/g7L7abK2UZV6AItLs9VHcwMKeSHn4xF2s9F1DdS3Abhea+8SK9Uov4Wqp+6D+D3f X-Received: by 2002:a17:907:209c:b0:7c1:41bb:70ac with SMTP id pv28-20020a170907209c00b007c141bb70acmr54760853ejb.64.1673248417299; Sun, 08 Jan 2023 23:13:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673248417; cv=none; d=google.com; s=arc-20160816; b=bllpfuNW8Iu98/iLePYk5twaoo6gKnGYt6Hc5fg8AKkbfYlTuH4y/msBnjWUe38l9V oiAeQyx/PRuBjzAFvFtiS+rXC/iPDU3nQzTyBBTI6P7TMlMLWSFuk1/U0XeBiv2D7aga kPO+zQ2kdivbWQK50ScouvUg+Hb7iwuBv5svP0zN1gpO8oEER2zHDgsU6cfc2w3daQPi hE2M19AOE/L4aLDAMqSuHOWY+J4Mr4NeQ/Yg1akbzFN1Ue7PwLP+IwJJY8Gr4+yg2CO0 zMqxZSVuy3owbKgQDRwSV3kIg8QONTsbpalrrzZgi4f4iMuXi3Z5z/doLooIZgVA4rRD yajQ== 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:dkim-signature:delivered-to; bh=KhOPuSq1a1/A6s7aiJeLGPot6alQgyx5s7MbzgsMMGI=; b=KF5OeEqomyoZCn+estXgUpXinRevd5hOK0NEj9IOPwyy/spDnqMY2WkrD80od2tPfe w7tfm9rp53qdIHEHmexBlawgTs6ZM4DiQ81XZl1h5GxpMZPsFhNBkQs1yECs6IuIZH6n WRa2+u3E/LIb/ml5kyHbfJyrY3EQwOp+ZHeNDFKeGGTT5gjTd3ivIJbr3pX5Hjirw6+b Og5TLlVzVoXsw55+VBk1hWGDtOfpallcPFE4xcUSWJnVvWYkdSKaQhClnYwSh4t1sVvg eNOMA8ynOBqC/W489fAep9B1jCgQTh0dE/kybQF/8/5bHdsjD74Nw4gLcZq6xDLb00Yc 5PSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=Qi7kWDZZ; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g10-20020a1709067c4a00b0080de94d6270si6633767ejp.304.2023.01.08.23.13.36; Sun, 08 Jan 2023 23:13:37 -0800 (PST) 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; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=Qi7kWDZZ; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5E93E68BC7B; Mon, 9 Jan 2023 09:12:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 910AB68BC09 for ; Mon, 9 Jan 2023 09:12:39 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673248364; x=1704784364; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=FCRfYoOjuI5VzBbqA0XFjj0s84toWj0U9lxkq00QPOk=; b=Qi7kWDZZ57eQvxsQ1x6G5f8uTo8PYPlnEb/RG13iJTrH2lsAEAIetLbV I/CucaPZKRVUAwk+dGzmvtiflwOjg1q75CYKyIKcPSpmUqnZ1KLTaNxeh 0lAPh943P4ZrOzgyvyDLtkc2vep5jj2Z6Oy2FJbW/MYU053V+unk7kHr2 J3nTYgo6N12dcFdtCHhppKxK7hUPZqsKIsfLb2dL3DzBXC7XKm2/EYHfZ L5QYDWolSRR7DpVs0S6XqMmKsz1ah4naYO1bPgddr3wugcuQLeWiGDsZy NA0CDOwaONPoZgYlUD03BAskairbAmizKPJdwDNZeefdWpv91Iql+hxiB Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10584"; a="385110847" X-IronPort-AV: E=Sophos;i="5.96,311,1665471600"; d="scan'208";a="385110847" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jan 2023 23:12:32 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10584"; a="745262815" X-IronPort-AV: E=Sophos;i="5.96,311,1665471600"; d="scan'208";a="745262815" Received: from xhh-tgl64.sh.intel.com ([10.238.2.19]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jan 2023 23:12:31 -0800 From: "Xiang, Haihao" To: ffmpeg-devel@ffmpeg.org Date: Mon, 9 Jan 2023 15:12:08 +0800 Message-Id: <20230109071210.1829699-6-haihao.xiang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230109071210.1829699-1-haihao.xiang@intel.com> References: <20230109071210.1829699-1-haihao.xiang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 6/8] lavfi/vf_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: QFaMyvtEaiTK From: Haihao Xiang This is in preparation for reusing the code for other QSV filters. E.g. deinterlacing_qsv may have an option array without format option Signed-off-by: Haihao Xiang --- 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 b04307b644..4aad856a2e 100644 --- a/libavfilter/vf_vpp_qsv.c +++ b/libavfilter/vf_vpp_qsv.c @@ -279,7 +279,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);