From patchwork Mon Dec 25 14:18:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 45319 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6623:b0:194:e134:edd4 with SMTP id n35csp2578106pzh; Mon, 25 Dec 2023 06:20:48 -0800 (PST) X-Google-Smtp-Source: AGHT+IGq7CWNU9MkAtvZi2bzp+JggxUlUjCRPwFFqqCaMV55rVhbdPMN0oIr+zlx1bSICkVCqe8J X-Received: by 2002:a05:600c:468c:b0:40d:4d91:60a7 with SMTP id p12-20020a05600c468c00b0040d4d9160a7mr2541639wmo.128.1703514048007; Mon, 25 Dec 2023 06:20:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703514047; cv=none; d=google.com; s=arc-20160816; b=b8bPT6/5hyCkGjjq9a1/3DRMsltGDKQu/dKfkQqdvBvkFVAwETOzNJDtP9xD/V5ire K+p1QP34WdEzI9lXEJhJcd0bjQ9uG8MRKmpVPOGYHJDJRrd4T9E3KzDjbkq9LAVMF59W 81KddOPDwR6/vTYrZACT7SEvqHhkz5Bcu2jI/9fEma0noy2FE6q1Tm6S9rXs0Z/HdUsH eu+YimEGunw4mOJhxcHZOnFyM3mC1vx/qqt2q4y8yhkFT5SyCE1KxWBv+leG/GIWUor6 nsZNoAob3rCYCgbF8eF4FBuJBWpEShiatEoOrSFBn+Tnqz5KtjZ3EjwiqsgZsKAjTaVs +mww== 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=OEHkb82iqyjmZu87UlRC7VGdCACf2KiWZyJeRBgjPCI=; fh=CX/m9qTuMDwrotqtm4RkAOJT6yXlKL2vcfWDitFPXZs=; b=s589oBgQvRSE8/K8UIu1t5keMT1+GQ7sYSM9XkD8puXBp6SKHMqKD8xWPEvufzafzq 8vtQpWymzJll6wLIwBZv5ZBLAvHAxbTQKRhC6xELam+QPUQiY/aIXW8JNdSlSeMZ6r4Z Zyp1O6QgbC5ixUpi1gItVLwyeqpgxPWRijv9ldpKV1FGTZg22B9ff6RiEKxs8OmNOwrP kp77RA32IMob9vYJACyXEex5lWxgXK9v/LwijYpAtcSdE2YVOl7W8d0BaQsWcSnUszWu bqFo7/8/rlMgBbas7Tm41rWeZ/OtLWi7QGHvuwTAOqRwofYoUTQROKpMQItdhb6sicgs DmRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=lDRx78xw; 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 qk9-20020a170906d9c900b00a2330accd39si4394106ejb.278.2023.12.25.06.20.47; Mon, 25 Dec 2023 06:20:47 -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=lDRx78xw; 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 3AD4368D1A8; Mon, 25 Dec 2023 16:20:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A2CBD68CFD1 for ; Mon, 25 Dec 2023 16:20:18 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1703514023; x=1735050023; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=hG2BxKmvIj/L1/2bwK0tfn5X6Eh0RDWy7Kr0cLwkDcw=; b=lDRx78xwW5okU5zHFIfZjvm1sBC8f0dcteBzVt/omOov/yeeua7enzkU yylGppp4Qg5wVwEFP2DIOkAy2Htwu7h76r87AjUAJNDZQ/CNn6NKLroXZ M41j/z0qSAhpo5pVbqZKCWI2vVoNFWkWC+IiG+QCo9yGmA1bMJVzW/fTV LoWQEIMkYx8ZJos9ILnF4o5Sxpcek14YjNEra6kTkVFlGDiXXP5Eq2I49 Cyft4VuQDzm1JSeWf6KVCiXffQv5v9/RgLNFewH/B5Ean5L4q2czthWBz 0CyXzgUveHPr+7+ZlrM5x4AXWFT428u4vYWCHm6dcoKIKqmHwA++VjpS+ A==; X-IronPort-AV: E=McAfee;i="6600,9927,10934"; a="9690318" X-IronPort-AV: E=Sophos;i="6.04,303,1695711600"; d="scan'208";a="9690318" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Dec 2023 06:19:58 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10934"; a="1024915291" X-IronPort-AV: E=Sophos;i="6.04,303,1695711600"; d="scan'208";a="1024915291" Received: from desktop-qn7n0nf.sh.intel.com (HELO localhost.localdomain) ([10.239.160.66]) by fmsmga006.fm.intel.com with ESMTP; 25 Dec 2023 06:19:56 -0800 From: Tong Wu To: ffmpeg-devel@ffmpeg.org Date: Mon, 25 Dec 2023 22:18:57 +0800 Message-ID: <20231225141859.664-4-tong1.wu@intel.com> X-Mailer: git-send-email 2.41.0.windows.1 In-Reply-To: <20231225141859.664-1-tong1.wu@intel.com> References: <20231225141859.664-1-tong1.wu@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/5] avcodec/d3d12va_decode: remove assertion from get_surface_index 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: Tong Wu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: wJd8RntW3wy0 Return zero for failed case and avoid aborting the program. Signed-off-by: Tong Wu --- libavcodec/d3d12va_decode.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavcodec/d3d12va_decode.c b/libavcodec/d3d12va_decode.c index 50d5b8d601..20dc485284 100644 --- a/libavcodec/d3d12va_decode.c +++ b/libavcodec/d3d12va_decode.c @@ -20,7 +20,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include #include #include @@ -80,7 +79,6 @@ unsigned ff_d3d12va_get_surface_index(const AVCodecContext *avctx, } fail: - assert(0); return 0; }