commit 5a26569fa398609c017249e3e93a3384be867208
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Wed Jan 18 21:11:11 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 18 21:11:11 2017 +0000
tree c6aee49ca82ca6942d5933a38e688ae723b46bcd
parent ce26193738baa1c8a61efc3f66379f4fc7335868
parent 1d5640f2f9013e8de68cedc3e57a6b02b495b3c2

Decoder: Initialize ps_cur_slice->u1_mbaff_frame_flag correctly for error cases
am: 1d5640f2f9

Change-Id: I32e960c752ccbc991f8ce04455618a534f1f52c7

decoder/ih264d_parse_slice.c

diff --git a/decoder/ih264d_parse_slice.c b/decoder/ih264d_parse_slice.c
index a907e81..11a317b 100644
--- a/decoder/ih264d_parse_slice.c
+++ b/decoder/ih264d_parse_slice.c
@@ -1343,6 +1343,8 @@
                 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