From patchwork Mon Feb 6 05:44:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Fei W" X-Patchwork-Id: 40293 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp3089947pzk; Sun, 5 Feb 2023 21:46:50 -0800 (PST) X-Google-Smtp-Source: AK7set89WPckNYnRMWDUqJoLsP30JCRAvMvB87x7rJ5NQKoFKg7qrcwui3+WjmeMcybSpgvslZdZ X-Received: by 2002:a17:907:7887:b0:877:573d:e919 with SMTP id ku7-20020a170907788700b00877573de919mr19172665ejc.20.1675662410526; Sun, 05 Feb 2023 21:46:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675662410; cv=none; d=google.com; s=arc-20160816; b=c2OlX328vY+6Pt5p6Qt5YHj0meCSv/1urAhfmJZ5gyPtmuUep1W7zYcXDNlq1zDrJZ kTb8UBPaGfmUzY09suw6FwbhGEDWD/DMQJlaOqQA2KrxzDnEqpSfTgPwueRPayp1TutS 6v1pMgINiFOKohxEzajWZh9qL3GdcqzPIzzdHgnKc3MMCrO+Wk+dWOh1DotyO2gnQM2t 77pM+xFmrTtyQ9U/P2atzRA1kzSvvCj3dmMpJa7FnsZ3eGc9ug6VxrE9usfVZ+3Mtn4x 9E/zOn5lUnarZ7WaBzrmXZEBBMV6oDA5Yolc4o9DWitp+xlThcFDBY3RsSFQs4xqpgib JjQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=EvA/KiwpYfQrT5s8+tk8tz/WVhAOq56XwT3lQwjXMKM=; b=dlQsE392kr2Z7CN54CyLevJnO1cuoX7MQPym3rhtzYRYkpB6UsdOsQxlzGT0lAeWHb NVtAGUlGZFfckHa7hkPmBCM/l0Ec8NRJ14OmZraPVKtRopmJkctQQgnsGDZkZW0M9f6Z wDM4RBRX6tA8j9/1G9J2uHYgoNTHe23a8dkG32zLW8GCGxJEnuL298bUBY9xkzG+Rf/l H0/zRZr1ikoAf8QuZtP0z5CACScpIFSr1u6axZaSK4PeFYgqngCgF6lQR0UywKjbVhVf vg2EIOTk94WRW3245ZttdMCErCFbLqp05O5KirrBVq7uVFZeRUJwjSJ2fGqihplhM6UZ o7aA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=kW8BKeRS; 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 om40-20020a170907a1a800b00877a61c8d7dsi11127486ejc.690.2023.02.05.21.46.49; Sun, 05 Feb 2023 21:46:50 -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=kW8BKeRS; 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 F1B1368BE54; Mon, 6 Feb 2023 07:46:18 +0200 (EET) 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 AE90668BE3C for ; Mon, 6 Feb 2023 07:46:11 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1675662376; x=1707198376; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=RzgeT27PLmco4fUtOCQPH5gyzkPiewt4BvWtHoO78Fw=; b=kW8BKeRS8eULo2VNk2lz3Ya/Ho4ikwZLvxzt4zXCiIpfSzJaeoZ+taQA MbTO00oOvrQOQ19u/5qqNXioNqm3bzvHzD2+7IixgKW57UQMGotQbRPMX 2L+hb1ErvgSMXhzapve28zCItbt/UK8M54CaeUuBH8fAWZjlT8s5QweI3 oBSwSY/FymzV/2PLZZkKFvtAz4Cb6KS/u+oYuorLvI1Zpi8jSMp5sD7p1 DuOQnsd6Py6AhqpWFKULTMp8uhXTt08WP54bOda+NdEzij986HfGAC7Pr wP1+KK/NMrR5y/wBOFGXNL17R4arcCq+vkyPTT7LAvQk++xzPYgGp9qTE A==; X-IronPort-AV: E=McAfee;i="6500,9779,10612"; a="317144204" X-IronPort-AV: E=Sophos;i="5.97,276,1669104000"; d="scan'208";a="317144204" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Feb 2023 21:46:04 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10612"; a="698737412" X-IronPort-AV: E=Sophos;i="5.97,276,1669104000"; d="scan'208";a="698737412" Received: from t.sh.intel.com ([10.239.159.159]) by orsmga001.jf.intel.com with ESMTP; 05 Feb 2023 21:46:04 -0800 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Feb 2023 13:44:53 +0800 Message-Id: <20230206054458.907060-5-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230206054458.907060-1-fei.w.wang@intel.com> References: <20230206054458.907060-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 05/10] lavc/hevcdec: Set max_num_merge_cand to uint8_t 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: P2BOfgzmgOik From: Linjie Fu uint8_t is big enough and keep consistent with the definition in cbs_h265.h. Signed-off-by: Linjie Fu Signed-off-by: Fei Wang --- libavcodec/hevcdec.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/hevcdec.h b/libavcodec/hevcdec.h index a7fc669bcb..aab816791e 100644 --- a/libavcodec/hevcdec.h +++ b/libavcodec/hevcdec.h @@ -304,7 +304,7 @@ typedef struct SliceHeader { int beta_offset; ///< beta_offset_div2 * 2 int tc_offset; ///< tc_offset_div2 * 2 - unsigned int max_num_merge_cand; ///< 5 - 5_minus_max_num_merge_cand + uint8_t max_num_merge_cand; ///< 5 - 5_minus_max_num_merge_cand uint8_t use_integer_mv_flag; unsigned *entry_point_offset;