commit aa88176cf690cc680b61d0fbae5cced218368b0b
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Thu Dec 15 18:04:53 2016 +0530
committer gitbuildkicker <android-build@google.com> Fri Jan 20 10:25:50 2017 -0800
tree 738cc1a6dff7899bae147c37ee521ecca0be7840
parent 1094045639d4f52028b0e88f3ff79cf6d7069d0b

Decoder: Initialize ps_cur_slice->u1_mbaff_frame_flag correctly for error cases

Bug: 34097213
Bug: 33641588
Change-Id: I40a6c5af7f1e46e1623ae1b399db3073123390fe
(cherry picked from commit 1d5640f2f9013e8de68cedc3e57a6b02b495b3c2)

decoder/ih264d_parse_slice.c

diff --git a/decoder/ih264d_parse_slice.c b/decoder/ih264d_parse_slice.c
index 05a82a6..80603c2 100644
--- a/decoder/ih264d_parse_slice.c
+++ b/decoder/ih264d_parse_slice.c
@@ -1344,6 +1344,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