From patchwork Mon Dec 7 12:55:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linjie Fu X-Patchwork-Id: 24413 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:c00a:0:0:0:0:0 with SMTP id c10csp2575480ybf; Mon, 7 Dec 2020 04:56:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJxv0Q8cDVPnQlMbu4hPCC77kIXE7kPqRmroDegq1RYyJzYY+wcy3wOSCL16UAxUSdCgcVx2 X-Received: by 2002:a1c:9acb:: with SMTP id c194mr17957163wme.43.1607345818950; Mon, 07 Dec 2020 04:56:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1607345818; cv=none; d=google.com; s=arc-20160816; b=hazsUIjZOxWCrB8s97A0PdqF6MJSVUzfD79aRKaxgV062qPX/yhS6Mm/LYw0YLy9bK X4Id6q4RSQbqJieOJyYCv7qMj2TRbg4f+/TvGOILFRW9uHwbTpQ6p+s9YKb3Jagw3tkz f1g4MS4ALZ0s3L09CXWSKqsQljj3v4eUV15azanRCqvZwCn7PSCq2R8cTKR8WcOunMW/ ClSx8uoq1ley+PZjf8Nc0CeElRPudHhMslS0K3dxhps4cY+TSBtNzcbGsPWfQhiuG3xd crasp3lr1KkpfxUr3DGAMO3EABPIls7jBK7GyV4Lc0wpqIksVyXboMaY4IWHDQ3fdhCG 6+mQ== 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=/CKwGAP1YM0E79++1DlgbETzp2FWAVVw081oA+koUGc=; b=fO2Cpg32BYgRyC34cYez6adZkaw2h1BHACIL+WvfUcRQBcl5LqPXKnXTdjSzuBl4Jr p/tzYS+HyrRwgmody2mGVueFnahupqvF1Q6isYIJCS1A7/v2/Wkxzi7opAhQrEV+7b7y THXS+xhAjDnkekZADu2czSmtZ4UmNyypaR1kbei8T1ELBwcN6NBSTaHMii1A4fYSPz3u GC7Ny7dr1s1ef3PnLVAi8LyVcMh8+AXRRkA+jo8hIEhAMARF6EENSbnGD34YHJYrXHmS j7tNFfhlQGFiBsTADwYfDiHFagdkCIMU1ALc7bJ3GMOD+5PMujc0PUVjCGVr9NEHjKTQ +6lg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=UDrPGLdY; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f24si11143087wmj.18.2020.12.07.04.56.58; Mon, 07 Dec 2020 04:56:58 -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=@gmail.com header.s=20161025 header.b=UDrPGLdY; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 84C63689A0D; Mon, 7 Dec 2020 14:56:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f195.google.com (mail-qk1-f195.google.com [209.85.222.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C4D8B689A0D for ; Mon, 7 Dec 2020 14:56:30 +0200 (EET) Received: by mail-qk1-f195.google.com with SMTP id z11so3134012qkj.7 for ; Mon, 07 Dec 2020 04:56:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OERLF4zwwkwOcBFlsGQTepTZ0Z335riwj7aK8UQqPe0=; b=UDrPGLdYdmINLaizTJt1Sva60xajHKGInB0canKYXURErRbvCeRvJgAG9+Mz2NqlgI OMQeupvuyJzxqyjYwNxfR36dlL1JiHMdwJFVYkPZkTWXOUsPbpohYLlruogXEpqDaImP UAVGreXFeuyeHYGBEP5Zh8VmUW3VIsCFKd7EnXUiZT6uspgjukRV6SSFRXUEBbNobhMP 6nBaveDvv3eYNTK6giQQcBRDpd71hIm/5C9TbqOLab7tQZKce9bgDyuOhZQrFBfFauJj Repk/742eLprH/KRKzpDNTJN6AxRxGgXqy+2H6eTi/L80J/srbTTfy1cGs5K+Tj6x8xC AuEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OERLF4zwwkwOcBFlsGQTepTZ0Z335riwj7aK8UQqPe0=; b=M2VhvIXH76Qq4EgUpBmv/eE1H51EqXcD3pLPnM05Nbau24B/DTp3i11ulyGleqfXli c5Xd2ERvsTVR6deJ+rDcZYgzb2Jj2WVjTOSeJlHTjRMtKJmQXk0SK6V0uh119n/ymoww xZ8nfTSmgEpAHWW4ayuyERFABnljQHoHZ4YSNX7hl+k1lmrb1VpQ+EpAl6CWMOdfmVwJ f1qeuuMyo7QbwXYIkiBpMuaodcusEVOPJL4xRpWTIa57wKtOpgG5g37rc88vGo22DTfT aiVJy7IsrL9d2/IvkjxWZhIKTy0cQVaBiydA5mu3zKmktos9qV8spBoUDXT/AbCfolOt 9yxg== X-Gm-Message-State: AOAM531SsD9U1I8C78Lq6rJ50HmcE/os9kq2xQntGtOu72KR/ckhVlZP XXOGAa3uC7t6NT/Hl9Qsj5pQ3oI6hNHceQ== X-Received: by 2002:a37:5243:: with SMTP id g64mr23753632qkb.248.1607345789087; Mon, 07 Dec 2020 04:56:29 -0800 (PST) Received: from ip-172-31-39-116.us-east-2.compute.internal (ec2-52-14-134-25.us-east-2.compute.amazonaws.com. [52.14.134.25]) by smtp.gmail.com with ESMTPSA id w15sm1638489qta.95.2020.12.07.04.56.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Dec 2020 04:56:28 -0800 (PST) From: Linjie Fu To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Dec 2020 12:55:43 +0000 Message-Id: <20201207125545.621159-7-linjie.justin.fu@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201207125545.621159-1-linjie.justin.fu@gmail.com> References: <20201207125545.621159-1-linjie.justin.fu@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 6/8] 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: PxAMHUwa4eim Content-Length: 1386 From: Linjie Fu 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 1164af2862..464eb7cd3c 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;