diff --git a/include/vlc_bits.h b/include/vlc_bits.h
index 947a9d0873b9758f7cfa8cf7e6941ffff8342598..7f6b67a71eedc0f84ee362e86d31b59c06573359 100644
--- a/include/vlc_bits.h
+++ b/include/vlc_bits.h
@@ -234,7 +234,7 @@ static inline uint32_t bs_read_ue( bs_t * bs )
 {
     int32_t i = 0;
 
-    while( bs_read1( bs ) == 0 && bs->p < bs->p_end && i < 32 )
+    while( bs_read1( bs ) == 0 && bs->p < bs->p_end && i < 31 )
         i++;
 
     return (1 << i) - 1 + bs_read( bs, i );
diff --git a/modules/packetizer/hevc_nal.c b/modules/packetizer/hevc_nal.c
index 6edd64c06300eb796dccb341e69e4beb8e27288a..24f12ffc201e529f1ea64217d428b454a9251528 100644
--- a/modules/packetizer/hevc_nal.c
+++ b/modules/packetizer/hevc_nal.c
@@ -1003,7 +1003,7 @@ static bool hevc_get_picture_CtbsYsize( const hevc_sequence_parameter_set_t *p_s
 {
     const unsigned int MinCbLog2SizeY = p_sps->log2_min_luma_coding_block_size_minus3 + 3;
     const unsigned int CtbLog2SizeY = MinCbLog2SizeY + p_sps->log2_diff_max_min_luma_coding_block_size;
-    if( CtbLog2SizeY > 32 )
+    if( CtbLog2SizeY > 31 )
         return false;
     const unsigned int CtbSizeY = 1 << CtbLog2SizeY;
     *p_w = (p_sps->pic_width_in_luma_samples - 1) / CtbSizeY + 1;