summaryrefslogtreecommitdiffstats
path: root/media/jni/mediaeditor/VideoBrowserMain.c
diff options
context:
space:
mode:
authorShyam Pallapothu <shyamp@google.com>2011-04-21 19:13:56 -0700
committerShyam Pallapothu <shyamp@google.com>2011-04-21 19:13:56 -0700
commitc0125dd4f1f8bb03ad16138f86d55ed3305240c4 (patch)
tree99b5a55808e8d00db39b78d1e8acd6859d4057fc /media/jni/mediaeditor/VideoBrowserMain.c
parent9f0df630fda450571e097ab6b1f1b1e5fa71e981 (diff)
downloadframeworks_base-c0125dd4f1f8bb03ad16138f86d55ed3305240c4.zip
frameworks_base-c0125dd4f1f8bb03ad16138f86d55ed3305240c4.tar.gz
frameworks_base-c0125dd4f1f8bb03ad16138f86d55ed3305240c4.tar.bz2
Fix for issue 4133431 "Remove OSAL layer" in JNI part
Change-Id: I4d38454cdf32cb87dadeedcecd19261dd0b0b927
Diffstat (limited to 'media/jni/mediaeditor/VideoBrowserMain.c')
-rwxr-xr-xmedia/jni/mediaeditor/VideoBrowserMain.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/jni/mediaeditor/VideoBrowserMain.c b/media/jni/mediaeditor/VideoBrowserMain.c
index cddab60..6ef688d 100755
--- a/media/jni/mediaeditor/VideoBrowserMain.c
+++ b/media/jni/mediaeditor/VideoBrowserMain.c
@@ -73,7 +73,7 @@ M4OSA_ERR videoBrowserSetWindow(
if (pC->m_frameColorType == VideoBrowser_kGB565) {
pC->m_outputPlane[0].u_stride = pC->m_outputPlane[0].u_width << 1;
- pC->m_outputPlane[0].pac_data = (M4OSA_UInt8*)M4OSA_malloc(
+ pC->m_outputPlane[0].pac_data = (M4OSA_UInt8*)M4OSA_32bitAlignedMalloc(
pC->m_outputPlane[0].u_stride * pC->m_outputPlane[0].u_height,
VIDEOBROWSER, (M4OSA_Char *)"output plane");
@@ -154,7 +154,7 @@ M4OSA_ERR videoBrowserCreate(
CHECK_PTR(videoBrowserCreate, pURL, err, M4ERR_PARAMETER);
/*--- Create context ---*/
- pContext = (VideoBrowserContext*)M4OSA_malloc(
+ pContext = (VideoBrowserContext*)M4OSA_32bitAlignedMalloc(
sizeof(VideoBrowserContext),
VIDEOBROWSER, (M4OSA_Char*)"Video browser context");