[FFmpeg-cvslog] lavc/hevcdec: Set max_num_merge_cand to uint8_t

Linjie Fu git at videolan.org
Mon Feb 27 07:56:10 EET 2023


ffmpeg | branch: master | Linjie Fu <linjie.fu at intel.com> | Thu Feb 16 13:46:32 2023 +0800| [fc3837ba85eafaeb5674c3d6b574a79da46d55b2] | committer: Haihao Xiang

lavc/hevcdec: Set max_num_merge_cand to uint8_t

uint8_t is big enough and keep consistent with the definition in
cbs_h265.h.

Signed-off-by: Linjie Fu <linjie.justin.fu at gmail.com>
Signed-off-by: Fei Wang <fei.w.wang at intel.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fc3837ba85eafaeb5674c3d6b574a79da46d55b2
---

 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;



More information about the ffmpeg-cvslog mailing list