diff options
| author | Hamsalekha S <hamsalekha.s@ittiam.com> | 2017-10-03 17:55:13 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-03 17:55:13 +0000 |
| commit | e127b146ffc72a52dfab144f057cf1b504210b1a (patch) | |
| tree | 9184ea0b0308627d63636910394cd6336581956f | |
| parent | 553a47869583e3b7a48b565e984ee2b8640d16f2 (diff) | |
| parent | 359a2ba84673e23d78d15a12ff6e76f080de179a (diff) | |
| download | android_external_libavc-e127b146ffc72a52dfab144f057cf1b504210b1a.tar.gz android_external_libavc-e127b146ffc72a52dfab144f057cf1b504210b1a.tar.bz2 android_external_libavc-e127b146ffc72a52dfab144f057cf1b504210b1a.zip | |
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 am: a55b5dd44f
am: 359a2ba846
Change-Id: Ia72f639861505d09d38f14abc67bbf5ca5ae21f1
| -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; } |