From patchwork Thu Feb 16 05:46:32 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: 40412 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp244504pzk; Wed, 15 Feb 2023 21:50:00 -0800 (PST) X-Google-Smtp-Source: AK7set/N9hNnIoGDE4mUR+eHizV3jRJ1u0dMolxviJD0ytR1496vkqm1QX8p810NlPQZJ3Ze6c4W X-Received: by 2002:a50:ed07:0:b0:4ad:66b:84a8 with SMTP id j7-20020a50ed07000000b004ad066b84a8mr5049347eds.6.1676526599767; Wed, 15 Feb 2023 21:49:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676526599; cv=none; d=google.com; s=arc-20160816; b=U5vMg3WKdQQbmsojS72gFfzCXY8zMV/tv8+mhcZZeV/QslBhNaUCm8iKaP5iwoImqX A5030RoQlZHE2Xfv8AOb5V2FMgB4RM+4zVzOqhTXVfztvot/scA1r3iHDLq6zhXk8qXV VpViV6M8OwlxI4GcetHva0oTiHrBTH2HzXUf4YNHZ3I4OlrU0P3VgW+Vodj/A4x57J9t MxVnssCEz1vUE7Anw2yTzfkvzJV41neRQ7zdKUVGylUBWasxx1OF1gubHejKCnds4m0/ bfWrdidThs3Ed7YfG4KFgibJjdv4vXdEiiE8zzGtDflrqMiK/wmcLt+Icfw+zBH0y8Q6 qwng== 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=avJe0sD9GPJZBNgI+ZD+/wpB0q9Ei6EM1j71ZxwNq9ca0V6Jc5r0FK4cmfUBLkZ2K0 rAJMgxaaGSCAIqwFjEJEpHrNINbe50FC6oLkLKmqr2ZjGBscU6X1Ua72924UrbI8EY5Y wIIBSosWJjAa4+6SH7pAy62vxT/B8jsV2P8MLj16FdHliZn6KBhdHISxGN2PEDDzo4mX 6lnUvAh1s5Qk3sKWgFp/VWM59yVuj6d6eEcAUI3yHwXGMy/3hYGYgXTiOeqvfNlD7WJJ OypmlYLj5vKXXKKhNj1+qRenBtGOUrGw6IOZjbJ0IuMc+c1gxXtBUMUSkU60PZdnaj8E MdtA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=KqeLzE4i; 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 uj42-20020a170907c9aa00b0088bf8e5331esi871495ejc.853.2023.02.15.21.49.59; Wed, 15 Feb 2023 21:49:59 -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=KqeLzE4i; 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 B08DF68BF21; Thu, 16 Feb 2023 07:49:21 +0200 (EET) 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 41E1A68BF0C for ; Thu, 16 Feb 2023 07:49:15 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1676526560; x=1708062560; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=RzgeT27PLmco4fUtOCQPH5gyzkPiewt4BvWtHoO78Fw=; b=KqeLzE4iJThB2oSt4HdxWkBAvxX3pGJIl8sxKJ/Cq4CcBOs/hYRJ9ce+ R6N+o6jUausJNqXJtaCZgokqN2GvWZpK3Y7qw3yalLQ2oL0UBE8WfC1vz mGlWm5MsOuHBts+BKPFSky+Bj5p/2EEIKNhF9cwPUY5mOfAOEPQj5xn/i kahv4JzknbyTOVXjj/u3B1QCMLcMfnB7dkGvhE73foYT/euW9jeb9zVDA oGJ3UKdoVxClzHb+/Nj8FE+ovqsPdEHn2ox+KwKd7J8Ly5GjvOVFl2rlc UYT1yltYooImH+cxD1DNfIXIUrbAe/CH/OXhXoMuLgQi5n8Ni4JCHDqJ3 A==; X-IronPort-AV: E=McAfee;i="6500,9779,10622"; a="331633184" X-IronPort-AV: E=Sophos;i="5.97,301,1669104000"; d="scan'208";a="331633184" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Feb 2023 21:49:05 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10622"; a="915547502" X-IronPort-AV: E=Sophos;i="5.97,301,1669104000"; d="scan'208";a="915547502" Received: from t.sh.intel.com ([10.239.159.159]) by fmsmga006.fm.intel.com with ESMTP; 15 Feb 2023 21:49:05 -0800 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Thu, 16 Feb 2023 13:46:32 +0800 Message-Id: <20230216054637.159397-5-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230216054637.159397-1-fei.w.wang@intel.com> References: <20230216054637.159397-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v7 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: NrqxWDeWZ08j 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;