diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-05-21 23:36:24 +0000 |
|---|---|---|
| committer | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-05-21 23:36:24 +0000 |
| commit | 1863b7cc038918298728488d57667d97c5cd505d (patch) | |
| tree | 0856c4aa59627d3becb1d1ee4b29e17e6a6e26b7 | |
| parent | c8fc4c020688b6253e33fdcb5ea70a1b8f7f0f0c (diff) | |
| parent | 051d4fb2dce65365564ec9607540e598d17d065b (diff) | |
| download | libavc-1863b7cc038918298728488d57667d97c5cd505d.tar.gz | |
[automerger] Bug fix for flush without valid frames am: 10c1176f1b am: 54fe392964 am: 6261ed297b am: 051d4fb2dc
Change-Id: I836923c5188a8b7090f8d0afa76de02f501df147
| -rw-r--r-- | decoder/ih264d_api.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/decoder/ih264d_api.c b/decoder/ih264d_api.c index f65094c..ef15bdb 100644 --- a/decoder/ih264d_api.c +++ b/decoder/ih264d_api.c @@ -1946,8 +1946,16 @@ WORD32 ih264d_video_decode(iv_obj_t *dec_hdl, void *pv_api_ip, void *pv_api_op) } - if(ps_dec->u1_flushfrm && ps_dec->u1_init_dec_flag) + if(ps_dec->u1_flushfrm) { + if(ps_dec->u1_init_dec_flag == 0) + { + /*Come out of flush mode and return*/ + ps_dec->u1_flushfrm = 0; + return (IV_FAIL); + } + + ih264d_get_next_display_field(ps_dec, ps_dec->ps_out_buffer, &(ps_dec->s_disp_op)); |