From patchwork Thu Jul 9 16:17:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Fu, Linjie" X-Patchwork-Id: 20924 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:80ca:0:0:0:0:0 with SMTP id c10csp1521144ybm; Thu, 9 Jul 2020 09:26:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyvtVeM2M9fnO+0+D2zePj3j5TA5NMOWyy8MmyayYOKZHYB2r+ywfcvuW9hI4LjKBlIH4R3 X-Received: by 2002:a7b:c116:: with SMTP id w22mr757160wmi.97.1594311966944; Thu, 09 Jul 2020 09:26:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594311966; cv=none; d=google.com; s=arc-20160816; b=ZdJAdP/3hENqoebLfRGEfoNWLiCw6RceUeWMmFjAA+m4VROrGapYBkYWHHKAlzfr/b xbzjQjJUJroD//YPyxKFvQeNIx3RZwoYDv1LOayV+Ebe/RXy8a0xD/U/X6Dfn8WNnZGZ 3k/qAKVB1pcERNmeLLsR94pnYn4roSWvUST/io4WWFrQK5HxBJKMZdzbMoUvhghrgqTU 8GMuUFTssR99xRQsvz20Jv0tn/9jXlJx+TbM+IZ180cCOCvWgzFEOegJWBnhY5FQ/8tX nLj8tXaESKdJ2HRbC+rZeUOTSfkjGb9wtGXN7oqgb8pojkPUYvifBOSprQprpmwP+EYd BDAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:ironport-sdr:ironport-sdr:delivered-to; bh=8kMIC+IPXF6dUHrrGIqde3spJm1GU04JOutrpcfS9as=; b=Xl6he9VrBJ6JLumf6HQ1mPsoDk9h18t3nab+kyoAf3qIBe/olVbu1zvVgm/TKivquF MAc6AwpKY9hAAPWyogy5v8dSgZBls2sRd/2vBiVb1t8/BlW0ThVWXPN+yLUJvotRnNRA x4Dg+KSwmxLXtxvDe3TOZIAriP3pdt26MfOcWMteimUrDDREuxmnS1P66Z7tOuIbkQu2 QOXciCvK1arWB1mc0VNz0eQ/HYq8QxuYfBdY5lVP+zqO2Nw1lBjQi81bZG8mB3wBTtBC YmM8y6X8YNkrGd1BRXtcy4HrwZ4osXpcSEvlyqzFSHDkphxtGjyGhMFYO1Jyw7Tm/ngE xYGA== 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 w8si2541896wru.103.2020.07.09.09.26.06; Thu, 09 Jul 2020 09:26:06 -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 2001768B574; Thu, 9 Jul 2020 19:25:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6746F68B559 for ; Thu, 9 Jul 2020 19:24:59 +0300 (EEST) IronPort-SDR: WRNGw2RMkn1boo2i39Uq0a+KE02bZH86JJaGBVBI0L3Qsj4RjbmACBZYE6+sao0gdx7KpQ7o/M 7SjxtTizXizg== X-IronPort-AV: E=McAfee;i="6000,8403,9677"; a="145529143" X-IronPort-AV: E=Sophos;i="5.75,331,1589266800"; d="scan'208";a="145529143" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jul 2020 09:24:59 -0700 IronPort-SDR: ISw37zllrxYyET2BUxFuSxY+fGNN23TZ9uI5dPZfYuawkgBfiFSmPrtnvDVuE8dH2Gjzdq1G8q nMH2SN1WzQkA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,331,1589266800"; d="scan'208";a="483859441" Received: from icl-dev.sh.intel.com ([10.239.158.73]) by fmsmga006.fm.intel.com with ESMTP; 09 Jul 2020 09:24:57 -0700 From: Linjie Fu To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 Jul 2020 00:17:39 +0800 Message-Id: <1594311460-10498-7-git-send-email-linjie.fu@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1594311460-10498-1-git-send-email-linjie.fu@intel.com> References: <1594311460-10498-1-git-send-email-linjie.fu@intel.com> Subject: [FFmpeg-devel] [PATCH 6/7] lavc/hevcdec: Set max_num_merge_cand to uint8_t X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Linjie Fu , Linjie Fu MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: faF7sFSSB5oI Content-Length: 1326 uint8_t is big enough and keep consistent with the definition in cbs_h265.h. Signed-off-by: Linjie Fu --- libavcodec/hevcdec.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/hevcdec.h b/libavcodec/hevcdec.h index 1164af2..464eb7c 100644 --- a/libavcodec/hevcdec.h +++ b/libavcodec/hevcdec.h @@ -301,7 +301,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;