commit b8dd27810094c3be9e7ed045f621491e23f1e5b9
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Wed Mar 28 17:26:01 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Wed Mar 28 17:26:01 2018 +0000
tree de0b1a62da668b4215fd9ad5d2e3fec71f971a7e
parent c3c07aa307aeda7349495f4016d3940d5442a0f3
parent bae32f4c46cb5d4350fd97c5ec15443590e2f3cd

[automerger] Decoder: Modify setting short term reference field flag am: 47cc04b40c am: 1991ec77e7 am: c18d0ab03a am: 8f05a87c39 am: ce46d15877 am: 8781a2aa9b am: 9cb460fb64 am: bae32f4c46

Change-Id: I08654a8c17e20ca0dd1ab433e85f98127418634f

decoder/ih264d_dpb_mgr.c

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 @@
         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 @@
             }
             else
             {
+                /* Can occur only for field bottom pictures */
+                ps_dpb_info[i].s_bot_field.u1_reference_info = IS_SHORT_TERM;
                 return OK;
             }
         }