commit 43a184ad481e2346f03f1398af74c04a3bb46e4d
author Ray Essick <essick@google.com> Wed Jan 18 21:00:19 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 18 21:00:19 2017 +0000
tree f942352d4f317192749c0c588ea7994e44f86c75
parent d5424f66e3bafea7112d6e864cb9f5ea64cbeef3
parent 1d5640f2f9013e8de68cedc3e57a6b02b495b3c2

Merge "Decoder: Initialize ps_cur_slice->u1_mbaff_frame_flag correctly for error cases" into mnc-dev

decoder/ih264d_parse_slice.c

diff --git a/decoder/ih264d_parse_slice.c b/decoder/ih264d_parse_slice.c
index c0195d7..880f3a8 100644
--- a/decoder/ih264d_parse_slice.c
+++ b/decoder/ih264d_parse_slice.c
@@ -1357,6 +1357,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