diff options
| author | Basavapatna Dattaguru <dattaguru@google.com> | 2011-02-23 20:25:47 -0800 |
|---|---|---|
| committer | Basavapatna Dattaguru <dattaguru@google.com> | 2011-02-23 20:25:47 -0800 |
| commit | d67e9da63323d965760337913f86de28024531a4 (patch) | |
| tree | 602acfaeb5a23fd013f7f885b45e9845bd70fc8d /libvideoeditor/osal | |
| parent | 3b84c8f8ab84915c93e2f6d0b32f2139afd95ed6 (diff) | |
| download | frameworks_av-d67e9da63323d965760337913f86de28024531a4.zip frameworks_av-d67e9da63323d965760337913f86de28024531a4.tar.gz frameworks_av-d67e9da63323d965760337913f86de28024531a4.tar.bz2 | |
VideoEditor: Issue ID: 3371667: Fix Set1
Change-Id: I728bc27b86e0c8720a2d05e6cff8a76f820bf016
Diffstat (limited to 'libvideoeditor/osal')
| -rwxr-xr-x | libvideoeditor/osal/src/LVOSA_FileReader_optim.c | 10 | ||||
| -rwxr-xr-x | libvideoeditor/osal/src/M4OSA_FileCache.c | 2 | ||||
| -rwxr-xr-x | libvideoeditor/osal/src/M4OSA_FileCommon.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/libvideoeditor/osal/src/LVOSA_FileReader_optim.c b/libvideoeditor/osal/src/LVOSA_FileReader_optim.c index 36541f0..4cf5fd8 100755 --- a/libvideoeditor/osal/src/LVOSA_FileReader_optim.c +++ b/libvideoeditor/osal/src/LVOSA_FileReader_optim.c @@ -167,7 +167,7 @@ M4OSA_ERR M4OSA_FileReader_BufferInit(M4OSA_FileReader_Context_optim* apContext) for(i=0; i<M4OSA_READBUFFER_NB; i++) { - apContext->buffer[i].data = (M4OSA_MemAddr8) M4OSA_malloc(M4OSA_READBUFFER_SIZE, M4OSA_FILE_READER, "M4OSA_FileReader_BufferInit"); + apContext->buffer[i].data = (M4OSA_MemAddr8) M4OSA_malloc(M4OSA_READBUFFER_SIZE, M4OSA_FILE_READER, (M4OSA_Char *)"M4OSA_FileReader_BufferInit"); M4ERR_CHECK_NULL_RETURN_VALUE(M4ERR_ALLOC, apContext->buffer[i].data); } @@ -545,7 +545,7 @@ M4OSA_ERR M4OSA_FileReader_CalculateSize(M4OSA_FileReader_Context_optim* apConte /* Allocate memory for the File reader context. */ apContext = (M4OSA_FileReader_Context_optim *)M4OSA_malloc(sizeof(M4OSA_FileReader_Context_optim), - M4OSA_FILE_READER, "M4OSA_FileReader_Context_optim"); + M4OSA_FILE_READER, (M4OSA_Char *)"M4OSA_FileReader_Context_optim"); M4ERR_CHECK_NULL_RETURN_VALUE(M4ERR_ALLOC, apContext); @@ -555,10 +555,10 @@ M4OSA_ERR M4OSA_FileReader_CalculateSize(M4OSA_FileReader_Context_optim* apConte /*Set the optimized functions, to be called by the user*/ apContext->FS = (M4OSA_FileReadPointer*) M4OSA_malloc(sizeof(M4OSA_FileReadPointer), - M4OSA_FILE_READER, "NXPSW_FileReaderOptim_init"); + M4OSA_FILE_READER, (M4OSA_Char *)"M4OSA_FileReaderOptim_init"); if (M4OSA_NULL==apContext->FS) { - M4OSA_TRACE1_0("NXPSW_FileReaderOptim_init - ERROR : allocation failed"); + M4OSA_TRACE1_0("M4OSA_FileReaderOptim_init - ERROR : allocation failed"); return M4ERR_ALLOC; } apContext->FS->openRead = M4OSA_fileReadOpen; @@ -567,7 +567,7 @@ M4OSA_ERR M4OSA_FileReader_CalculateSize(M4OSA_FileReader_Context_optim* apConte apContext->FS->closeRead = M4OSA_fileReadClose; apContext->FS->setOption = M4OSA_fileReadSetOption; apContext->FS->getOption = M4OSA_fileReadGetOption; - #else +#else apContext->FS = FS; #endif diff --git a/libvideoeditor/osal/src/M4OSA_FileCache.c b/libvideoeditor/osal/src/M4OSA_FileCache.c index a804123..0f66f96 100755 --- a/libvideoeditor/osal/src/M4OSA_FileCache.c +++ b/libvideoeditor/osal/src/M4OSA_FileCache.c @@ -431,7 +431,7 @@ M4OSA_Void M4OSA_FileCache_QS_quickSort64 (M4OSA_Time array[], M4OSA_UInt32 size return; } - M4OSA_FileCache_internalQuicksort64(array,0,size-1); + M4OSA_FileCache_internalQuicksort64((M4OSA_Int64 * const)array, 0, size-1); } /* __________________________________________________________ */ diff --git a/libvideoeditor/osal/src/M4OSA_FileCommon.c b/libvideoeditor/osal/src/M4OSA_FileCommon.c index 52fe781..d80d8cc 100755 --- a/libvideoeditor/osal/src/M4OSA_FileCommon.c +++ b/libvideoeditor/osal/src/M4OSA_FileCommon.c @@ -25,7 +25,7 @@ #ifndef USE_STAGEFRIGHT_CODECS #error "USE_STAGEFRIGHT_CODECS is not defined" -#endif USE_STAGEFRIGHT_CODECS +#endif /*USE_STAGEFRIGHT_CODECS*/ #ifdef UTF_CONVERSION #include <string.h> |