aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2018-03-28 17:25:55 +0000
committerAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2018-03-28 17:25:55 +0000
commit8f05a87c3972cf25bfa26d2b4816e51e1294c938 (patch)
tree57842410dfaa0197f743f8b630b3a455c5705b60
parenta0f9fb4a8d0cd002dce195e6b0368af339169e0e (diff)
parentc18d0ab03adb56062b53276434a25c6bd34974ef (diff)
downloadlibavc-8f05a87c3972cf25bfa26d2b4816e51e1294c938.tar.gz
[automerger] Decoder: Modify setting short term reference field flag am: 47cc04b40c am: 1991ec77e7 am: c18d0ab03a
Change-Id: I5096da453e95ac6e337e1423a2152729bb460918
-rw-r--r--decoder/ih264d_dpb_mgr.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/decoder/ih264d_dpb_mgr.c b/decoder/ih264d_dpb_mgr.c
index 8c6bb19..f9124e4 100644
--- a/decoder/ih264d_dpb_mgr.c
+++ b/decoder/ih264d_dpb_mgr.c
@@ -374,9 +374,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)
{
@@ -384,6 +381,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;
}
}