commit a7326a8a64161bf01ae41a72923fa2c351b37e1a
author Linux Build Service Account <lnxbuild@localhost> Mon Jan 05 13:52:48 2015 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Jan 05 13:52:48 2015 -0800
tree e9154c44b2218b2f0731e253889d9133a1115e39
parent e1785b18f5f13ea9a98e604dbb3f9f811a25c183
parent 064de8b1ef8940b45135c567568a4c52b1f94d1f

Merge "mm-audio: aenc-aac: fix integer overflow for encoded buffer timestamp calculation"

mm-audio/aenc-aac/qdsp6/inc/omx_aac_aenc.h

diff --git a/mm-audio/aenc-aac/qdsp6/inc/omx_aac_aenc.h b/mm-audio/aenc-aac/qdsp6/inc/omx_aac_aenc.h
index 2e2abbf..a87717b 100644
--- a/mm-audio/aenc-aac/qdsp6/inc/omx_aac_aenc.h
+++ b/mm-audio/aenc-aac/qdsp6/inc/omx_aac_aenc.h
@@ -457,7 +457,7 @@
     unsigned int                   m_flags;      //encapsulate the waiting states.
     OMX_U64                        nTimestamp;
     OMX_U64                        ts;
-    uint32_t                       m_frame_count;
+    OMX_U64                        m_frame_count;
     unsigned int                   frameduration;
     unsigned int                   pcm_input; //tunnel or non-tunnel
     unsigned int                   m_inp_act_buf_count;    // Num of Input Buffers