diff --git a/decoder/ihevcd_parse_headers.c b/decoder/ihevcd_parse_headers.c
index 2f84d12..00fc9cb 100644
--- a/decoder/ihevcd_parse_headers.c
+++ b/decoder/ihevcd_parse_headers.c
@@ -1257,6 +1257,12 @@
     if((0 >= ps_sps->i2_pic_width_in_luma_samples) || (0 >= ps_sps->i2_pic_height_in_luma_samples))
         return IHEVCD_INVALID_PARAMETER;
 
+    /* i2_pic_width_in_luma_samples and i2_pic_height_in_luma_samples
+       should be multiples of min_cb_size. Here these are aligned to 8,
+       i.e. smallest CB size */
+    ps_sps->i2_pic_width_in_luma_samples = ALIGN8(ps_sps->i2_pic_width_in_luma_samples);
+    ps_sps->i2_pic_height_in_luma_samples = ALIGN8(ps_sps->i2_pic_height_in_luma_samples);
+
     if((ps_sps->i2_pic_width_in_luma_samples > ps_codec->i4_max_wd) ||
        (ps_sps->i2_pic_width_in_luma_samples * ps_sps->i2_pic_height_in_luma_samples >
                        ps_codec->i4_max_wd * ps_codec->i4_max_ht) ||