commit f064a2924466b1843cd34101df3abe467a5dae4e
author android-build-team Robot <android-build-team-robot@google.com> Fri Nov 03 21:26:04 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Nov 03 21:26:04 2017 +0000
tree 68c45260968995f889d08be7037e56dbed9365fc
parent 76e119cdf803e666ab3cccbce92e5aef344d6caa
parent 4f17d68d8c141b6862e72590113394d48f22162a

Merge cherrypicks of [3167927, 3167338, 3164932, 3167993, 3167994, 3167995, 3167505, 3167506, 3167507, 3167508, 3167509, 3167510, 3167511, 3167512, 3168013, 3168014, 3166332, 3168033, 3168034, 3168035, 3168036, 3168037, 3168038, 3168039, 3168040, 3167977, 3167979, 3167983, 3167717, 3167928, 3168068, 3168069] into nyc-bugfix-release

Change-Id: I501a11378f5455432abe40872e3a45a3e0d9b7a6

decoder/ih264d_parse_slice.c

diff --git a/decoder/ih264d_parse_slice.c b/decoder/ih264d_parse_slice.c
index bdfccb6..2d8a9af 100644
--- a/decoder/ih264d_parse_slice.c
+++ b/decoder/ih264d_parse_slice.c
@@ -1382,9 +1382,8 @@
         if(ps_dec->u1_dangling_field == 1)
         {
             ps_dec->u1_second_field = 1 - ps_dec->u1_second_field;
-            ps_cur_slice->u1_bottom_field_flag = u1_bottom_field_flag;
-            ps_dec->u2_prv_frame_num = u2_frame_num;
             ps_dec->u1_first_slice_in_stream = 0;
+            ps_dec->u1_top_bottom_decoded = TOP_FIELD_ONLY | BOT_FIELD_ONLY;
             return ERROR_DANGLING_FIELD_IN_PIC;
         }