From patchwork Fri May 14 04:53:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 27762 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp121508iof; Thu, 13 May 2021 21:57:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz30h2xlCDNVH19SpS9iP8fmoMfbo74gn6qWxbe82sZ4YsTIimV0/EEhdbdvmyONt7OdDiS X-Received: by 2002:a17:906:9141:: with SMTP id y1mr48667566ejw.111.1620968269524; Thu, 13 May 2021 21:57:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620968269; cv=none; d=google.com; s=arc-20160816; b=01VyRCVKHcujxXP4M7BRYiWyLigl1Jwh8L8btzKp13c1hDR9YJL4NtSHma6qG/Mhbt xFpbN/gHtBa1FSZKFcQtUTyPK9EyGc/eLz7rc4M+7sYWji/L0ta2vpjaQkIt+MXIHp2+ dSOK+o+4a+RqCwOQqAG4r9Y3DT4tZpSAMZ31SeQ+55BPHV962Xhp2KoniBFSAuPIn9FM CSjVrG7aYEqu0SjE5f4YqoCG8CbQHBVS4v3+NZioFDI5KCmAwDGssuUzPzcG6vDxAuK7 q06RAWzNUG/AuXLr7jXMPqEM9ecBKotPKp1K0tifxv4BYT/rhFESIxakmttIXukRRltO ToVA== 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=A8r4clSrJnXI3mUe8qeBHiEm4sXgiwciViQkXQqROYUUs8370k0K6UX6yTfghPdjEK CnmNNhVlmbgJNFnjb0vP6OJRZR4CzNiOV8gt1Yd196qpEB+gr4Dnv1KWFZzy7Pl0SjyS tQKX+q6YEt5GVpAIHAjrb1Vr4Lem/OaNQGJ7qxzA7pETU71tI8a9B5T7HydAoFAxLy+Z M44SUlNPnjFWNE+Oq0NPBHd319Hkg946v2a3JCaD+Hsz+FPdAqRsGQle++TG45tCeSvd wiDry7tUpcTXN/PIYolFC0rq2wPo4OjJQhE6cS3pFau+QI7PrmWBbjpUF2Y29XQxZK+h 2CIw== 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 x2si6047999ejy.213.2021.05.13.21.57.49; Thu, 13 May 2021 21:57:49 -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 3A2C1689903; Fri, 14 May 2021 07:55:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 72EF46882FD for ; Fri, 14 May 2021 07:54:48 +0300 (EEST) IronPort-SDR: LouafKDmgo+a5QIlqAlVllKYd5xMjV1Hg/9lou9A7OZMTYEy7ydVoxJLKkXQj6biYupHID2WT9 1GVdnBjdd6lw== X-IronPort-AV: E=McAfee;i="6200,9189,9983"; a="179711913" X-IronPort-AV: E=Sophos;i="5.82,299,1613462400"; d="scan'208";a="179711913" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 May 2021 21:54:41 -0700 IronPort-SDR: VnXyK5JrooMGp6WQVt6f5Ac1pkQYTqif8s5CmdQwDmWGc0YAdYN0bkT54kxUih6ZKrnokHQHA3 NgmCJgaGYQFA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,299,1613462400"; d="scan'208";a="626673122" Received: from xhh-tgl64.sh.intel.com ([10.239.159.130]) by fmsmga005.fm.intel.com with ESMTP; 13 May 2021 21:54:40 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Fri, 14 May 2021 12:53:55 +0800 Message-Id: <20210514045400.3277256-18-haihao.xiang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210514045400.3277256-1-haihao.xiang@intel.com> References: <20210514045400.3277256-1-haihao.xiang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 17/22] lavf/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: 7l++hVv7lZq6 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);