commit e9ec948685c0fa0e0b094683821daedfaff83ec5
author Hamsalekha S <hamsalekha.s@ittiam.com> Tue Oct 03 17:43:45 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 03 17:43:45 2017 +0000
tree cba185cca162dc72ce4024c868abcfe85f4c36c5
parent 85615c3618d819fec667d54c03761836643bf1ec
parent 73763b165ebb8f7f75054dbee2b8184c5fa9219f

Merge "Decoder: Fixed hang in the case of dangling field" into mnc-dev am: 2f1ca945b1 am: 1b1e6d3ec9 am: 8ec4061310 am: 40d1b833d8
am: 73763b165e

Change-Id: Ia96b46ff5c254047eeff4dad62a0429a6d75ddf9

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;
         }