diff options
author | Mark Salyzyn <salyzyn@google.com> | 2014-04-04 14:47:28 -0700 |
---|---|---|
committer | Mark Salyzyn <salyzyn@google.com> | 2014-04-15 13:18:22 -0700 |
commit | db43b34c3428e480f8c4c66e7e88f4001f37f91e (patch) | |
tree | be194bf06c84b61f277a1c29c7499aa7862494a4 /libvideoeditor/vss/src/M4READER_Amr.c | |
parent | 1df2557ac95a6d8a087fb15f6f842dc049f2759b (diff) | |
download | frameworks_av-db43b34c3428e480f8c4c66e7e88f4001f37f91e.zip frameworks_av-db43b34c3428e480f8c4c66e7e88f4001f37f91e.tar.gz frameworks_av-db43b34c3428e480f8c4c66e7e88f4001f37f91e.tar.bz2 |
media: 64 bit compile issues
- change internal sized types to use stdint.h
- printf & scanf formats
- size_t or unsigned int for iterators
Change-Id: Id993a70d8bf54c667c5d652b34179a2c727ed446
Diffstat (limited to 'libvideoeditor/vss/src/M4READER_Amr.c')
-rwxr-xr-x | libvideoeditor/vss/src/M4READER_Amr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libvideoeditor/vss/src/M4READER_Amr.c b/libvideoeditor/vss/src/M4READER_Amr.c index 0859157..71f0e28 100755 --- a/libvideoeditor/vss/src/M4READER_Amr.c +++ b/libvideoeditor/vss/src/M4READER_Amr.c @@ -303,7 +303,7 @@ M4OSA_ERR M4READER_AMR_getNextStream(M4OSA_Context context, M4READER_MediaFamily pStreamHandler->m_decoderSpecificInfoSize = streamDesc.decoderSpecificInfoSize; pStreamHandler->m_streamId = streamDesc.streamID; pStreamHandler->m_duration = streamDesc.duration; - pStreamHandler->m_pUserData = (void*)streamDesc.timeScale; /*trick to change*/ + pStreamHandler->m_pUserData = (void*)(intptr_t)streamDesc.timeScale; /*trick to change*/ if (streamDesc.duration > pC->m_maxDuration) { @@ -704,7 +704,7 @@ M4OSA_ERR M4READER_AMR_getNextAu(M4OSA_Context context, M4_StreamHandler *pStrea if (err == M4NO_ERROR) { - timeScale = (M4OSA_Float)(M4OSA_Int32)(pStreamHandler->m_pUserData)/1000; + timeScale = (M4OSA_Float)(M4OSA_Int32)(intptr_t)(pStreamHandler->m_pUserData)/1000; pAccessUnit->m_dataAddress = (M4OSA_MemAddr8)pAu->dataAddress; pAccessUnit->m_size = pAu->size; pAccessUnit->m_CTS = (M4_MediaTime)pAu->CTS/*/timeScale*/; |