merged with master and resolved conflicts; adapted to GGMLBlock API

stable-diffusion.h

@@ -72,6 +72,7 @@ enum sd_type_t {
     SD_TYPE_Q6_K    = 14,
     SD_TYPE_Q8_K    = 15,
     SD_TYPE_IQ2_XXS = 16,
+    SD_TYPE_IQ2_XS  = 17,
     SD_TYPE_I8,
     SD_TYPE_I16,
     SD_TYPE_I32,
@@ -152,6 +153,21 @@ SD_API sd_image_t* img2img(sd_ctx_t* sd_ctx,
                            int64_t seed,
                            int batch_count);
 
+SD_API sd_image_t* img2vid(sd_ctx_t* sd_ctx,
+                           sd_image_t init_image,
+                           int width,
+                           int height,
+                           int video_frames,
+                           int motion_bucket_id,
+                           int fps,
+                           float augmentation_level,
+                           float min_cfg,
+                           float cfg_scale,
+                           enum sample_method_t sample_method,
+                           int sample_steps,
+                           float strength,
+                           int64_t seed);
+
 typedef struct upscaler_ctx_t upscaler_ctx_t;
 
 SD_API upscaler_ctx_t* new_upscaler_ctx(const char* esrgan_path,