wrapper/libavc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
am: a55b5dd44f

Change-Id: I4393ad6185c54c0cf6cd8534e03cbca1d81f5af5
This commit is contained in:
Hamsalekha S 2017-10-03 17:52:12 +00:00 • committed by android-build-merger
commit 359a2ba846
1 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
decoder/ih264d_parse_slice.c
View file

@ -1382,9 +1382,8 @@ WORD32 ih264d_parse_decode_slice(UWORD8 u1_is_idr_slice,
if(ps_dec->u1_dangling_field == 1) if(ps_dec->u1_dangling_field == 1)
{ {
ps_dec->u1_second_field = 1 - ps_dec->u1_second_field; 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_first_slice_in_stream = 0;
ps_dec->u1_top_bottom_decoded = TOP_FIELD_ONLY | BOT_FIELD_ONLY;
return ERROR_DANGLING_FIELD_IN_PIC; return ERROR_DANGLING_FIELD_IN_PIC;
} }