From 1d5640f2f9013e8de68cedc3e57a6b02b495b3c2 Mon Sep 17 00:00:00 2001
From: Harish Mahendrakar <harish.mahendrakar@ittiam.com>
Date: Thu, 15 Dec 2016 18:04:53 +0530
Subject: [PATCH] Decoder: Initialize ps_cur_slice->u1_mbaff_frame_flag
 correctly for error cases

Bug: 34097213
Bug: 33641588
Change-Id: I40a6c5af7f1e46e1623ae1b399db3073123390fe
---
 decoder/ih264d_parse_slice.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/decoder/ih264d_parse_slice.c b/decoder/ih264d_parse_slice.c
index 054dd62..1155a4c 100644
--- a/decoder/ih264d_parse_slice.c
+++ b/decoder/ih264d_parse_slice.c
@@ -1358,6 +1358,8 @@ WORD32 ih264d_parse_decode_slice(UWORD8 u1_is_idr_slice,
                 ps_cur_slice->u1_redundant_pic_cnt = u1_redundant_pic_cnt;
                 ps_cur_slice->u1_nal_ref_idc = u1_nal_ref_idc;
                 ps_cur_slice->u1_pic_order_cnt_type = u1_pic_order_cnt_type;
+                ps_cur_slice->u1_mbaff_frame_flag = ps_seq->u1_mb_aff_flag
+                        && (!u1_field_pic_flag);
             }
         }
         else