diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-04-08 07:22:10 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-04-08 07:22:10 +0000 |
| commit | ae4187c3828476e784dde44f54c1ba505becac91 (patch) | |
| tree | a623a1288feeb56c6c1b70a9001c05c7e162e213 | |
| parent | 4b38cffeeade2bf754d9cab89690b2a54ef2c60d (diff) | |
| parent | 2bdde8d7d89fbd69a5ad080809f38452383ae887 (diff) | |
| download | android_external_libavc-ae4187c3828476e784dde44f54c1ba505becac91.tar.gz android_external_libavc-ae4187c3828476e784dde44f54c1ba505becac91.tar.bz2 android_external_libavc-ae4187c3828476e784dde44f54c1ba505becac91.zip | |
Snap for 4706961 from 2bdde8d7d89fbd69a5ad080809f38452383ae887 to pi-release
Change-Id: I3ef2710807870ced25aef19419dfea156fd77df1
| -rw-r--r-- | decoder/ih264d_dpb_mgr.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/decoder/ih264d_dpb_mgr.c b/decoder/ih264d_dpb_mgr.c index 525adef..b7ee498 100644 --- a/decoder/ih264d_dpb_mgr.c +++ b/decoder/ih264d_dpb_mgr.c @@ -375,9 +375,6 @@ WORD32 ih264d_insert_st_node(dpb_manager_t *ps_dpb_mgr, if((ps_dpb_info[i].ps_pic_buf == ps_pic_buf) && ps_dpb_info[i].u1_used_as_ref) { - /* Can occur only for field bottom pictures */ - ps_dpb_info[i].s_bot_field.u1_reference_info = IS_SHORT_TERM; - /*signal an error in the case of frame pic*/ if(ps_dpb_info[i].ps_pic_buf->u1_pic_type == FRM_PIC) { @@ -385,6 +382,8 @@ WORD32 ih264d_insert_st_node(dpb_manager_t *ps_dpb_mgr, } else { + /* Can occur only for field bottom pictures */ + ps_dpb_info[i].s_bot_field.u1_reference_info = IS_SHORT_TERM; return OK; } } |