commit f688a41d2bfa470385763378aa06bce203cff134
author ChengYou Ho <chengyouho@google.com> Mon Nov 19 16:17:57 2018 +0800
committer ChengYou Ho <chengyouho@google.com> Mon Nov 19 16:24:41 2018 +0800
tree e204a28213fab6c5fe49b8be626d35a0b434c1ac
parent 2456fd350c20bb44ca87c2d995078034e00b4bf7
parent 3917ac13a577a8416e4ecc678c39eaf93510590d

Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.8.9.08.00.00.478.122' into pi-dev

Bug: 119743470
Change-Id: I68e199b766edb15c24ad78b94b6fccf42abee405

mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp

diff --git a/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp b/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp
index 3548d08..e3f8892 100644
--- a/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp
+++ b/mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp
@@ -3206,7 +3206,7 @@
     while (m_ftb_q.m_size) {
         m_ftb_q.pop_entry(&p1,&p2,&ident);
         if (ident == m_fill_output_msg ) {
-            print_omx_buffer("Flush FBD", (OMX_BUFFERHEADERTYPE *)&p2);
+            print_omx_buffer("Flush FBD", (OMX_BUFFERHEADERTYPE *)p2);
             m_cb.FillBufferDone(&m_cmp, m_app_data, (OMX_BUFFERHEADERTYPE *)(intptr_t)p2);
         } else if (ident == OMX_COMPONENT_GENERATE_FBD) {
             fill_buffer_done(&m_cmp,(OMX_BUFFERHEADERTYPE *)(intptr_t)p1);
@@ -3247,15 +3247,15 @@
         m_etb_q.pop_entry(&p1,&p2,&ident);
 
         if (ident == OMX_COMPONENT_GENERATE_ETB_ARBITRARY) {
-            print_omx_buffer("Flush ETB_ARBITRARY", (OMX_BUFFERHEADERTYPE *)&p2);
+            print_omx_buffer("Flush ETB_ARBITRARY", (OMX_BUFFERHEADERTYPE *)p2);
             m_cb.EmptyBufferDone(&m_cmp ,m_app_data, (OMX_BUFFERHEADERTYPE *)p2);
         } else if (ident == OMX_COMPONENT_GENERATE_ETB) {
             pending_input_buffers++;
             VIDC_TRACE_INT_LOW("ETB-pending", pending_input_buffers);
-            print_omx_buffer("Flush ETB", (OMX_BUFFERHEADERTYPE *)&p2);
+            print_omx_buffer("Flush ETB", (OMX_BUFFERHEADERTYPE *)p2);
             empty_buffer_done(&m_cmp,(OMX_BUFFERHEADERTYPE *)p2);
         } else if (ident == OMX_COMPONENT_GENERATE_EBD) {
-            print_omx_buffer("Flush EBD", (OMX_BUFFERHEADERTYPE *)&p1);
+            print_omx_buffer("Flush EBD", (OMX_BUFFERHEADERTYPE *)p1);
             empty_buffer_done(&m_cmp,(OMX_BUFFERHEADERTYPE *)p1);
         }
     }