diff options
| author | Hamsalekha S <hamsalekha.s@ittiam.com> | 2017-10-03 17:50:43 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-03 17:50:43 +0000 |
| commit | a55b5dd44f2fd4719c7a2dd5e653047686424083 (patch) | |
| tree | cba185cca162dc72ce4024c868abcfe85f4c36c5 | |
| parent | 70defc46d20750e3e6b1dac885f3898ce8d5fe9c (diff) | |
| parent | 5795e09124844a6db5c3ab79008804d0004a939a (diff) | |
| download | libavc-a55b5dd44f2fd4719c7a2dd5e653047686424083.tar.gz | |
Merge "Decoder: Fixed hang in the case of dangling field" into mnc-dev am: 2f1ca945b1 am: 1b1e6d3ec9 am: 8ec4061310 am: 40d1b833d8 am: 73763b165e am: e9ec948685 am: 2411d507d4
am: 5795e09124
Change-Id: I77647b40a35dd939e8b910afd0335c3a3027a56a
| -rw-r--r-- | decoder/ih264d_parse_slice.c | 3 |
1 files changed, 1 insertions, 2 deletions
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 @@ WORD32 ih264d_parse_decode_slice(UWORD8 u1_is_idr_slice, 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; } |