Fix for issue 4133431 "Remove OSAL layer" in engine part

Change-Id: I9e2e142bcdf3153c529b790e368caea4fdb65ac8

35 files changed, 572 insertions, 699 deletions

diff --git a/libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp b/libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp
index 5dc3970..2fbb573 100755
--- a/libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp
+++ b/libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp
@@ -585,8 +585,8 @@ size_t VideoEditorAudioPlayer::fillBuffer(void *data, size_t size) {
                                          &ptFrame, &bgFrame, &mixFrame);
 
                                         // Overwrite the decoded buffer
-                                    M4OSA_memcpy((M4OSA_MemAddr8)ptr,
-                                         (M4OSA_MemAddr8)mixFrame.m_dataAddress, len);
+                                    memcpy((void *)ptr,
+                                         (void *)mixFrame.m_dataAddress, len);
                                 }
                             }
                         } else if (mAudioMixSettings->bLoop){
diff --git a/libvideoeditor/lvpp/VideoEditorBGAudioProcessing.cpp b/libvideoeditor/lvpp/VideoEditorBGAudioProcessing.cpp
index 28208d1..9368d54 100755
--- a/libvideoeditor/lvpp/VideoEditorBGAudioProcessing.cpp
+++ b/libvideoeditor/lvpp/VideoEditorBGAudioProcessing.cpp
@@ -74,8 +74,8 @@ M4OSA_Int32 VideoEditorBGAudioProcessing::veProcessAudioMixNDuck(
     pMixedOutBuffer->m_bufferSize = pPrimaryTrack->m_bufferSize;

 

     // Before mixing, we need to have only PT as out buffer

-    M4OSA_memcpy((M4OSA_MemAddr8)pMixedOutBuffer->m_dataAddress,

-     (M4OSA_MemAddr8)pPrimaryTrack->m_dataAddress, pMixedOutBuffer->m_bufferSize);

+    memcpy((void *)pMixedOutBuffer->m_dataAddress,

+     (void *)pPrimaryTrack->m_dataAddress, pMixedOutBuffer->m_bufferSize);

 

     // Initially contains the input primary track

     pPTMdata2 = (M4OSA_Int16*)pMixedOutBuffer->m_dataAddress;

@@ -210,8 +210,8 @@ M4OSA_Int32 VideoEditorBGAudioProcessing::veProcessAudioMixNDuck(
         pPTMdata2++;

     }

     //LOGV("VideoEditorBGAudioProcessing:: Copy final out ");

-    M4OSA_memcpy((M4OSA_MemAddr8)pMixedOutBuffer->m_dataAddress,

-     (M4OSA_MemAddr8)pBackgroundTrack->m_dataAddress,

+    memcpy((void *)pMixedOutBuffer->m_dataAddress,

+     (void *)pBackgroundTrack->m_dataAddress,

       pBackgroundTrack->m_bufferSize);

 

     LOGV("VideoEditorBGAudioProcessing::lvProcessAudioMixNDuck EXIT");

diff --git a/libvideoeditor/lvpp/VideoEditorPreviewController.cpp b/libvideoeditor/lvpp/VideoEditorPreviewController.cpp
index c9da6b0..164e2b3 100755
--- a/libvideoeditor/lvpp/VideoEditorPreviewController.cpp
+++ b/libvideoeditor/lvpp/VideoEditorPreviewController.cpp
@@ -217,8 +217,8 @@ M4OSA_ERR VideoEditorPreviewController::loadEditSettings(
             LOGE("loadEditSettings: Malloc error");

             return M4ERR_ALLOC;

         }

-        M4OSA_memset((M4OSA_MemAddr8)mClipList,

-         sizeof(M4VSS3GPP_ClipSettings*)*pSettings->uiClipNumber, 0);

+        memset((void *)mClipList,0,

+         sizeof(M4VSS3GPP_ClipSettings*)*pSettings->uiClipNumber);

 

         for(i=0;i<pSettings->uiClipNumber;i++) {

 

@@ -233,8 +233,8 @@ M4OSA_ERR VideoEditorPreviewController::loadEditSettings(
                 return M4ERR_ALLOC;

             }

             // Copy plain structure

-            M4OSA_memcpy((M4OSA_MemAddr8)mClipList[i],

-             (M4OSA_MemAddr8)pSettings->pClipList[i],

+            memcpy((void *)mClipList[i],

+             (void *)pSettings->pClipList[i],

              sizeof(M4VSS3GPP_ClipSettings));

 

             if(NULL != pSettings->pClipList[i]->pFile) {

@@ -248,8 +248,8 @@ M4OSA_ERR VideoEditorPreviewController::loadEditSettings(
                     return M4ERR_ALLOC;

                 }

 

-                M4OSA_memcpy((M4OSA_MemAddr8)mClipList[i]->pFile,

-                 (M4OSA_MemAddr8)pSettings->pClipList[i]->pFile,

+                memcpy((void *)mClipList[i]->pFile,

+                 (void *)pSettings->pClipList[i]->pFile,

                  pSettings->pClipList[i]->filePathSize);

             }

             else {

@@ -279,8 +279,8 @@ M4OSA_ERR VideoEditorPreviewController::loadEditSettings(
                 return M4ERR_ALLOC;

             }

 

-            M4OSA_memset((M4OSA_MemAddr8)mEffectsSettings,

-             mNumberEffects*sizeof(M4VSS3GPP_EffectSettings), 0);

+            memset((void *)mEffectsSettings,0,

+             mNumberEffects*sizeof(M4VSS3GPP_EffectSettings));

 

             for(i=0;i<mNumberEffects;i++) {

 

@@ -288,8 +288,8 @@ M4OSA_ERR VideoEditorPreviewController::loadEditSettings(
                 mEffectsSettings[i].xVSS.pFramingBuffer = NULL;

                 mEffectsSettings[i].xVSS.pTextBuffer = NULL;

 

-                M4OSA_memcpy((M4OSA_MemAddr8)&(mEffectsSettings[i]),

-                 (M4OSA_MemAddr8)&(pSettings->Effects[i]),

+                memcpy((void *)&(mEffectsSettings[i]),

+                 (void *)&(pSettings->Effects[i]),

                  sizeof(M4VSS3GPP_EffectSettings));

 

                 if(pSettings->Effects[i].VideoEffectType ==

@@ -367,9 +367,9 @@ M4OSA_ERR VideoEditorPreviewController::loadEditSettings(
                      pSettings->Effects[i].xVSS.uialphaBlendingFadeOutTime;

 

                     // Copy the pFraming data

-                    M4OSA_memcpy((M4OSA_MemAddr8)

+                    memcpy((void *)

                     mEffectsSettings[i].xVSS.pFramingBuffer->pac_data,

-                    (M4OSA_MemAddr8)pSettings->Effects[i].xVSS.pFramingBuffer->pac_data,

+                    (void *)pSettings->Effects[i].xVSS.pFramingBuffer->pac_data,

                     rgbSize);

 

                     mEffectsSettings[i].xVSS.rgbType =

@@ -390,8 +390,8 @@ M4OSA_ERR VideoEditorPreviewController::loadEditSettings(
             return M4ERR_ALLOC;

         }

 

-        M4OSA_memset((M4OSA_MemAddr8)mBackgroundAudioSetting, sizeof(M4xVSS_AudioMixingSettings*), 0);

-        M4OSA_memcpy((M4OSA_MemAddr8)mBackgroundAudioSetting, (M4OSA_MemAddr8)bgmSettings, sizeof(M4xVSS_AudioMixingSettings));

+        memset((void *)mBackgroundAudioSetting, 0,sizeof(M4xVSS_AudioMixingSettings*));

+        memcpy((void *)mBackgroundAudioSetting, (void *)bgmSettings, sizeof(M4xVSS_AudioMixingSettings));

 

         if ( mBackgroundAudioSetting->pFile != M4OSA_NULL ) {

 

@@ -770,12 +770,12 @@ M4OSA_ERR VideoEditorPreviewController::clearSurface(
      (M4OSA_UInt32)outBufferStride, (M4VIFI_UInt8 *)outBuffer);

 

     /* Fill the surface with black frame */

-    M4OSA_memset((M4OSA_MemAddr8)planeOut[0].pac_data,planeOut[0].u_width *

-                            planeOut[0].u_height * 1.5,0x00);

-    M4OSA_memset((M4OSA_MemAddr8)planeOut[1].pac_data,planeOut[1].u_width *

-                            planeOut[1].u_height,128);

-    M4OSA_memset((M4OSA_MemAddr8)planeOut[2].pac_data,planeOut[2].u_width *

-                             planeOut[2].u_height,128);

+    memset((void *)planeOut[0].pac_data,0x00,planeOut[0].u_width *

+                            planeOut[0].u_height * 1.5);

+    memset((void *)planeOut[1].pac_data,128,planeOut[1].u_width *

+                            planeOut[1].u_height);

+    memset((void *)planeOut[2].pac_data,128,planeOut[2].u_width *

+                             planeOut[2].u_height);

 

     mTarget->renderYV12();

     return err;

diff --git a/libvideoeditor/lvpp/VideoEditorTools.cpp b/libvideoeditor/lvpp/VideoEditorTools.cpp
index c0be4dd..6e86139 100755
--- a/libvideoeditor/lvpp/VideoEditorTools.cpp
+++ b/libvideoeditor/lvpp/VideoEditorTools.cpp
@@ -282,7 +282,7 @@ M4VIFI_UInt8 M4VIFI_YUV420PlanarToYUV420Semiplanar(void *user_data,
     /* The input Y Plane is the same as the output Y Plane */

     p_buf_src = &(PlaneIn[0].pac_data[PlaneIn[0].u_topleft]);

     p_buf_dest = &(PlaneOut[0].pac_data[PlaneOut[0].u_topleft]);

-    M4OSA_memcpy((M4OSA_Int8*)p_buf_dest,(M4OSA_Int8*)p_buf_src ,

+    memcpy((void *)p_buf_dest,(void *)p_buf_src ,

         PlaneOut[0].u_width * PlaneOut[0].u_height);

 

     /* The U and V components are planar. The need to be made interleaved */

@@ -313,7 +313,7 @@ M4VIFI_UInt8 M4VIFI_SemiplanarYUV420toYUV420(void *user_data,
      /* The input Y Plane is the same as the output Y Plane */

      p_buf_src = &(PlaneIn[0].pac_data[PlaneIn[0].u_topleft]);

      p_buf_dest = &(PlaneOut[0].pac_data[PlaneOut[0].u_topleft]);

-     M4OSA_memcpy((M4OSA_Int8*)p_buf_dest,(M4OSA_Int8*)p_buf_src ,

+     memcpy((void *)p_buf_dest,(void *)p_buf_src ,

          PlaneOut[0].u_width * PlaneOut[0].u_height);

 

      /* The U and V components are planar. The need to be made interleaved */

@@ -375,32 +375,32 @@ M4OSA_ERR M4VSS3GPP_externalVideoEffectColor(M4OSA_Void *pFunctionContext,
                 switch (ColorContext->colorEffectType)

                 {

                 case M4xVSS_kVideoEffectType_BlackAndWhite:

-                    M4OSA_memset((M4OSA_MemAddr8)p_buf_dest,

-                     PlaneIn[plane_number].u_width, 128);

+                    memset((void *)p_buf_dest,128,

+                     PlaneIn[plane_number].u_width);

                     break;

                 case M4xVSS_kVideoEffectType_Pink:

-                    M4OSA_memset((M4OSA_MemAddr8)p_buf_dest,

-                     PlaneIn[plane_number].u_width, 255);

+                    memset((void *)p_buf_dest,255,

+                     PlaneIn[plane_number].u_width);

                     break;

                 case M4xVSS_kVideoEffectType_Green:

-                    M4OSA_memset((M4OSA_MemAddr8)p_buf_dest,

-                     PlaneIn[plane_number].u_width, 0);

+                    memset((void *)p_buf_dest,0,

+                     PlaneIn[plane_number].u_width);

                     break;

                 case M4xVSS_kVideoEffectType_Sepia:

                     if(plane_number==1)

                     {

-                        M4OSA_memset((M4OSA_MemAddr8)p_buf_dest,

-                         PlaneIn[plane_number].u_width, 117);

+                        memset((void *)p_buf_dest,117,

+                         PlaneIn[plane_number].u_width);

                     }

                     else

                     {

-                        M4OSA_memset((M4OSA_MemAddr8)p_buf_dest,

-                         PlaneIn[plane_number].u_width, 139);

+                        memset((void *)p_buf_dest,139,

+                         PlaneIn[plane_number].u_width);

                     }

                     break;

                 case M4xVSS_kVideoEffectType_Negative:

-                    M4OSA_memcpy((M4OSA_MemAddr8)p_buf_dest,

-                     (M4OSA_MemAddr8)p_buf_src ,PlaneOut[plane_number].u_width);

+                    memcpy((void *)p_buf_dest,

+                     (void *)p_buf_src ,PlaneOut[plane_number].u_width);

                     break;

 

                 case M4xVSS_kVideoEffectType_ColorRGB16:

@@ -417,15 +417,15 @@ M4OSA_ERR M4VSS3GPP_externalVideoEffectColor(M4OSA_Void *pFunctionContext,
                         {

                             /*then convert to u*/

                             u = U16(r, g, b);

-                            M4OSA_memset((M4OSA_MemAddr8)p_buf_dest,

-                             PlaneIn[plane_number].u_width, (M4OSA_UInt8)u);

+                            memset((void *)p_buf_dest,(M4OSA_UInt8)u,

+                             PlaneIn[plane_number].u_width);

                         }

                         if(plane_number==2)

                         {

                             /*then convert to v*/

                             v = V16(r, g, b);

-                            M4OSA_memset((M4OSA_MemAddr8)p_buf_dest,

-                             PlaneIn[plane_number].u_width, (M4OSA_UInt8)v);

+                            memset((void *)p_buf_dest,(M4OSA_UInt8)v,

+                             PlaneIn[plane_number].u_width);

                         }

                     }

                     break;

@@ -448,15 +448,15 @@ M4OSA_ERR M4VSS3GPP_externalVideoEffectColor(M4OSA_Void *pFunctionContext,
                         {

                             /*then convert to u*/

                             u = U16(r, g, b);

-                            M4OSA_memset((M4OSA_MemAddr8)p_buf_dest,

-                             PlaneIn[plane_number].u_width, (M4OSA_UInt8)u);

+                            memset((void *)p_buf_dest,(M4OSA_UInt8)u,

+                             PlaneIn[plane_number].u_width);

                         }

                         if(plane_number==2)

                         {

                             /*then convert to v*/

                             v = V16(r, g, b);

-                            M4OSA_memset((M4OSA_MemAddr8)p_buf_dest,

-                             PlaneIn[plane_number].u_width, (M4OSA_UInt8)v);

+                            memset((void *)p_buf_dest,(M4OSA_UInt8)v,

+                             PlaneIn[plane_number].u_width);

                         }

                     }

                     break;

@@ -478,8 +478,8 @@ M4OSA_ERR M4VSS3GPP_externalVideoEffectColor(M4OSA_Void *pFunctionContext,
                     }

                     break;

                 default:

-                    M4OSA_memcpy((M4OSA_MemAddr8)p_buf_dest,

-                     (M4OSA_MemAddr8)p_buf_src ,PlaneOut[plane_number].u_width);

+                    memcpy((void *)p_buf_dest,

+                     (void *)p_buf_src ,PlaneOut[plane_number].u_width);

                     break;

                 }

             }

@@ -780,9 +780,9 @@ M4OSA_ERR M4VSS3GPP_externalVideoEffectFifties(
         for (x = 0; x < pPlaneOut[plane_number].u_height; x++)

         {

             if (1 == plane_number)

-                M4OSA_memset((M4OSA_MemAddr8)pOutCr, pPlaneIn[plane_number].u_width, 117); /* U value */

+                memset((void *)pOutCr, 117,pPlaneIn[plane_number].u_width); /* U value */

             else

-                M4OSA_memset((M4OSA_MemAddr8)pOutCr, pPlaneIn[plane_number].u_width, 139); /* V value */

+                memset((void *)pOutCr, 139,pPlaneIn[plane_number].u_width); /* V value */

 

             pInCr  += pPlaneIn[plane_number].u_stride;

             pOutCr += pPlaneOut[plane_number].u_stride;

@@ -860,8 +860,8 @@ unsigned char M4VFL_modifyLumaWithScale(M4ViComImagePlane *plane_in,
         {

             for (i = u_width; i != 0; i--)

             {

-                M4OSA_memcpy((M4OSA_MemAddr8)p_cdest_line, (M4OSA_MemAddr8)p_csrc_line, u_width);

-                M4OSA_memcpy((M4OSA_MemAddr8)p_cdest, (M4OSA_MemAddr8)p_csrc, u_width);

+                memcpy((void *)p_cdest_line, (void *)p_csrc_line, u_width);

+                memcpy((void *)p_cdest, (void *)p_csrc, u_width);

             }

             p_cdest_line += u_stride_out;

             p_cdest += u_stride_out;

@@ -975,12 +975,12 @@ unsigned char M4VFL_applyCurtain(M4ViComImagePlane *plane_in, M4ViComImagePlane
         /* write black lines */

         for (j = (nb_black_lines >> 1); j != 0; j--)

         {

-            M4OSA_memset((M4OSA_MemAddr8)p_dest, u_width, 0);

+            memset((void *)p_dest, 0,u_width);

             p_dest += u_stride_out;

-            M4OSA_memset((M4OSA_MemAddr8)p_dest, u_width, 0);

+            memset((void *)p_dest, 0,u_width);

             p_dest += u_stride_out;

-            M4OSA_memset((M4OSA_MemAddr8)p_destu, u_widthuv, 128);

-            M4OSA_memset((M4OSA_MemAddr8)p_destv, u_widthuv, 128);

+            memset((void *)p_destu, 128,u_widthuv);

+            memset((void *)p_destv, 128,u_widthuv);

             p_destu += u_stride_out_uv;

             p_destv += u_stride_out_uv;

         }

@@ -988,14 +988,14 @@ unsigned char M4VFL_applyCurtain(M4ViComImagePlane *plane_in, M4ViComImagePlane
         /* copy from source image */

         for (j = (u_height - nb_black_lines) >> 1; j != 0; j--)

         {

-            M4OSA_memcpy((M4OSA_MemAddr8)p_dest, (M4OSA_MemAddr8)p_src, u_width);

+            memcpy((void *)p_dest, (void *)p_src, u_width);

             p_dest += u_stride_out;

             p_src += u_stride;

-            M4OSA_memcpy((M4OSA_MemAddr8)p_dest, (M4OSA_MemAddr8)p_src, u_width);

+            memcpy((void *)p_dest, (void *)p_src, u_width);

             p_dest += u_stride_out;

             p_src += u_stride;

-            M4OSA_memcpy((M4OSA_MemAddr8)p_destu, (M4OSA_MemAddr8)p_srcu, u_widthuv);

-            M4OSA_memcpy((M4OSA_MemAddr8)p_destv, (M4OSA_MemAddr8)p_srcv, u_widthuv);

+            memcpy((void *)p_destu, (void *)p_srcu, u_widthuv);

+            memcpy((void *)p_destv, (void *)p_srcv, u_widthuv);

             p_destu += u_stride_out_uv;

             p_destv += u_stride_out_uv;

             p_srcu += u_stride_uv;

@@ -1012,14 +1012,14 @@ unsigned char M4VFL_applyCurtain(M4ViComImagePlane *plane_in, M4ViComImagePlane
         /* copy from source image image */

         for (j = (nb_black_lines >> 1); j != 0; j--)

         {

-            M4OSA_memcpy((M4OSA_MemAddr8)p_dest, (M4OSA_MemAddr8)p_src, u_width);

+            memcpy((void *)p_dest, (void *)p_src, u_width);

             p_dest += u_stride_out;

             p_src += u_stride;

-            M4OSA_memcpy((M4OSA_MemAddr8)p_dest, (M4OSA_MemAddr8)p_src, u_width);

+            memcpy((void *)p_dest, (void *)p_src, u_width);

             p_dest += u_stride_out;

             p_src += u_stride;

-            M4OSA_memcpy((M4OSA_MemAddr8)p_destu, (M4OSA_MemAddr8)p_srcu, u_widthuv);

-            M4OSA_memcpy((M4OSA_MemAddr8)p_destv, (M4OSA_MemAddr8)p_srcv, u_widthuv);

+            memcpy((void *)p_destu, (void *)p_srcu, u_widthuv);

+            memcpy((void *)p_destv, (void *)p_srcv, u_widthuv);

             p_destu += u_stride_out_uv;

             p_destv += u_stride_out_uv;

             p_srcu += u_stride_uv;

@@ -1030,12 +1030,12 @@ unsigned char M4VFL_applyCurtain(M4ViComImagePlane *plane_in, M4ViComImagePlane
         /* the pointers to p_dest, p_destu and p_destv are used through the two loops "for" */

         for (j = (u_height - nb_black_lines) >> 1; j != 0; j--)

         {

-            M4OSA_memset((M4OSA_MemAddr8)p_dest, u_width, 0);

+            memset((void *)p_dest, 0,u_width);

             p_dest += u_stride_out;

-            M4OSA_memset((M4OSA_MemAddr8)p_dest, u_width, 0);

+            memset((void *)p_dest, 0,u_width);

             p_dest += u_stride_out;

-            M4OSA_memset((M4OSA_MemAddr8)p_destu, u_widthuv, 128);

-            M4OSA_memset((M4OSA_MemAddr8)p_destv, u_widthuv, 128);

+            memset((void *)p_destu, 128,u_widthuv);

+            memset((void *)p_destv, 128,u_widthuv);

             p_destu += u_stride_out_uv;

             p_destv += u_stride_out_uv;

         }

@@ -1573,7 +1573,7 @@ M4VIFI_UInt8 M4VIFI_YUV420toYUV420(void *user_data, M4VIFI_ImagePlane PlaneIn[3]
         p_buf_dest = &(PlaneOut[plane_number].pac_data[PlaneOut[plane_number].u_topleft]);

         for (i = 0; i < PlaneOut[plane_number].u_height; i++)

         {

-            M4OSA_memcpy((M4OSA_MemAddr8)p_buf_dest, (M4OSA_MemAddr8)p_buf_src ,PlaneOut[plane_number].u_width);

+            memcpy((void *)p_buf_dest, (void *)p_buf_src ,PlaneOut[plane_number].u_width);

             p_buf_src += PlaneIn[plane_number].u_stride;

             p_buf_dest += PlaneOut[plane_number].u_stride;

         }

@@ -1877,9 +1877,9 @@ M4OSA_ERR applyRenderingMode(M4VIFI_ImagePlane* pPlaneIn, M4VIFI_ImagePlane* pPl
         Media rendering: Black borders*/

         if(mediaRendering == M4xVSS_kBlackBorders)

         {

-            M4OSA_memset((M4OSA_MemAddr8)pPlaneOut[0].pac_data,(pPlaneOut[0].u_height*pPlaneOut[0].u_stride),Y_PLANE_BORDER_VALUE);

-            M4OSA_memset((M4OSA_MemAddr8)pPlaneOut[1].pac_data,(pPlaneOut[1].u_height*pPlaneOut[1].u_stride),U_PLANE_BORDER_VALUE);

-            M4OSA_memset((M4OSA_MemAddr8)pPlaneOut[2].pac_data,(pPlaneOut[2].u_height*pPlaneOut[2].u_stride),V_PLANE_BORDER_VALUE);

+            memset((void *)pPlaneOut[0].pac_data,Y_PLANE_BORDER_VALUE,(pPlaneOut[0].u_height*pPlaneOut[0].u_stride));

+            memset((void *)pPlaneOut[1].pac_data,U_PLANE_BORDER_VALUE,(pPlaneOut[1].u_height*pPlaneOut[1].u_stride));

+            memset((void *)pPlaneOut[2].pac_data,V_PLANE_BORDER_VALUE,(pPlaneOut[2].u_height*pPlaneOut[2].u_stride));

 

             pImagePlanesTemp[0].u_width = pPlaneOut[0].u_width;

             pImagePlanesTemp[0].u_height = pPlaneOut[0].u_height;

@@ -1925,9 +1925,9 @@ M4OSA_ERR applyRenderingMode(M4VIFI_ImagePlane* pPlaneIn, M4VIFI_ImagePlane* pPl
             pInPlaneU = pImagePlanesTemp[1].pac_data ;

             pInPlaneV = pImagePlanesTemp[2].pac_data ;

 

-            M4OSA_memset((M4OSA_MemAddr8)pImagePlanesTemp[0].pac_data,(pImagePlanesTemp[0].u_height*pImagePlanesTemp[0].u_stride),Y_PLANE_BORDER_VALUE);

-            M4OSA_memset((M4OSA_MemAddr8)pImagePlanesTemp[1].pac_data,(pImagePlanesTemp[1].u_height*pImagePlanesTemp[1].u_stride),U_PLANE_BORDER_VALUE);

-            M4OSA_memset((M4OSA_MemAddr8)pImagePlanesTemp[2].pac_data,(pImagePlanesTemp[2].u_height*pImagePlanesTemp[2].u_stride),V_PLANE_BORDER_VALUE);

+            memset((void *)pImagePlanesTemp[0].pac_data,Y_PLANE_BORDER_VALUE,(pImagePlanesTemp[0].u_height*pImagePlanesTemp[0].u_stride));

+            memset((void *)pImagePlanesTemp[1].pac_data,U_PLANE_BORDER_VALUE,(pImagePlanesTemp[1].u_height*pImagePlanesTemp[1].u_stride));

+            memset((void *)pImagePlanesTemp[2].pac_data,V_PLANE_BORDER_VALUE,(pImagePlanesTemp[2].u_height*pImagePlanesTemp[2].u_stride));

 

             if((M4OSA_UInt32)((pPlaneIn->u_height * pPlaneOut->u_width) /pPlaneIn->u_width) <= pPlaneOut->u_height)//Params.m_inputSize.m_height < Params.m_inputSize.m_width)

             {

@@ -2061,19 +2061,19 @@ M4OSA_ERR applyRenderingMode(M4VIFI_ImagePlane* pPlaneIn, M4VIFI_ImagePlane* pPl
         {

             for(i=0; i<pPlaneOut[0].u_height; i++)

             {

-                M4OSA_memcpy((M4OSA_MemAddr8)pOutPlaneY, (M4OSA_MemAddr8)pInPlaneY, pPlaneOut[0].u_width);

+                memcpy((void *)pOutPlaneY, (void *)pInPlaneY, pPlaneOut[0].u_width);

                 pInPlaneY += pPlaneOut[0].u_width;

                 pOutPlaneY += pPlaneOut[0].u_stride;

             }

             for(i=0; i<pPlaneOut[1].u_height; i++)

             {

-                M4OSA_memcpy((M4OSA_MemAddr8)pOutPlaneU, (M4OSA_MemAddr8)pInPlaneU, pPlaneOut[1].u_width);

+                memcpy((void *)pOutPlaneU, (void *)pInPlaneU, pPlaneOut[1].u_width);

                 pInPlaneU += pPlaneOut[1].u_width;

                 pOutPlaneU += pPlaneOut[1].u_stride;

             }

             for(i=0; i<pPlaneOut[2].u_height; i++)

             {

-                M4OSA_memcpy((M4OSA_MemAddr8)pOutPlaneV, (M4OSA_MemAddr8)pInPlaneV, pPlaneOut[2].u_width);

+                memcpy((void *)pOutPlaneV, (void *)pInPlaneV, pPlaneOut[2].u_width);

                 pInPlaneV += pPlaneOut[2].u_width;

                 pOutPlaneV += pPlaneOut[2].u_stride;

             }

@@ -2580,7 +2580,7 @@ M4OSA_ERR M4AIR_get(M4OSA_Context pContext, M4VIFI_ImagePlane* pIn, M4VIFI_Image
                     for (j=0; j<loc_height; j++)

                     {

                         /**< Copy one whole line */

-                        memcpy((M4OSA_MemAddr8)pu8_data_out, (M4OSA_MemAddr8)pu8_data_in, loc_width);

+                        memcpy((void *)pu8_data_out, (void *)pu8_data_in, loc_width);

 

                         /**< Update pointers */

                         pu8_data_out += pOut[i].u_stride;

diff --git a/libvideoeditor/osal/inc/M4OSA_Memory.h b/libvideoeditor/osal/inc/M4OSA_Memory.h
index d0bb49c..d060602 100755
--- a/libvideoeditor/osal/inc/M4OSA_Memory.h
+++ b/libvideoeditor/osal/inc/M4OSA_Memory.h
@@ -45,19 +45,6 @@ M4OSAL_MEMORY_EXPORT_TYPE extern M4OSA_MemAddr32 M4OSA_malloc (M4OSA_UInt32 size
 
 M4OSAL_MEMORY_EXPORT_TYPE extern M4OSA_Void  M4OSA_free   (M4OSA_MemAddr32 address);
 
-M4OSAL_MEMORY_EXPORT_TYPE extern M4OSA_Void M4OSA_memset (M4OSA_MemAddr8 address,
-                                                          M4OSA_UInt32 size,
-                                                          M4OSA_UInt8 value);
-
-M4OSAL_MEMORY_EXPORT_TYPE extern M4OSA_Void M4OSA_memcpy (M4OSA_MemAddr8 outputBlock,
-                                      M4OSA_MemAddr8 inputBlock, M4OSA_UInt32 size);
-
-M4OSAL_MEMORY_EXPORT_TYPE extern M4OSA_MemAddr8 M4OSA_memmove(M4OSA_MemAddr8 outputBlock,
-                                              M4OSA_MemAddr8 inputBlock,
-                                              M4OSA_UInt32 size);
-
-M4OSAL_MEMORY_EXPORT_TYPE extern M4OSA_Int32 M4OSA_memcmp (M4OSA_MemAddr8 address1,
-                                      M4OSA_MemAddr8 address2, M4OSA_UInt32 size);
 
 M4OSAL_MEMORY_EXPORT_TYPE extern M4OSA_ERR M4OSA_randInit(void);
 
diff --git a/libvideoeditor/osal/src/LVOSA_FileReader_optim.c b/libvideoeditor/osal/src/LVOSA_FileReader_optim.c
index 4cf5fd8..dd4d269 100755
--- a/libvideoeditor/osal/src/LVOSA_FileReader_optim.c
+++ b/libvideoeditor/osal/src/LVOSA_FileReader_optim.c
@@ -207,7 +207,7 @@ M4OSA_FilePosition M4OSA_FileReader_BufferCopy(M4OSA_FileReader_Context_optim* a
     copysize = apContext->buffer[i].size - offset;
     copysize = (size < copysize) ? size : copysize;
 
-    M4OSA_memcpy(pData, apContext->buffer[i].data + offset, copysize);
+    memcpy((void *)pData, (void *)(apContext->buffer[i].data + offset), copysize);
 
     apContext->buffer[i].remain -= copysize;
     apContext->buffer[i].nbFillSinceLastAcess = 0;
diff --git a/libvideoeditor/osal/src/M4OSA_Thread.c b/libvideoeditor/osal/src/M4OSA_Thread.c
index 08a25fc..c17ddf4 100755
--- a/libvideoeditor/osal/src/M4OSA_Thread.c
+++ b/libvideoeditor/osal/src/M4OSA_Thread.c
@@ -646,7 +646,7 @@ M4OSA_ERR M4OSA_SetThreadSyncName(M4OSA_Context context,
          return M4ERR_ALLOC;
       }
 
-      M4OSA_memcpy((M4OSA_MemAddr8)threadContext->name, (M4OSA_MemAddr8)name,
+      memcpy((void *)threadContext->name, (void *)name,
                    nameSize);
    }
 
diff --git a/libvideoeditor/osal/src/M4PSW_MemoryInterface.c b/libvideoeditor/osal/src/M4PSW_MemoryInterface.c
index 1dd4d3a..3128de2 100755
--- a/libvideoeditor/osal/src/M4PSW_MemoryInterface.c
+++ b/libvideoeditor/osal/src/M4PSW_MemoryInterface.c
@@ -84,100 +84,5 @@ M4OSA_Void M4OSA_free (M4OSA_MemAddr32 address)
     free(address);
 }
 
-
-/**
- ************************************************************************
- * @fn         M4OSA_Void M4OSA_memset(M4OSA_MemAddr8 block,
- *                                     M4OSA_UInt32 size,
- *                                     M4OSA_UInt8 value)
- * @brief      this function initializes the provided memory block with value
- * @note
- * @param      block (IN): address of block to fill
- * @param      size  (IN): size of the provided block
- * @param      value (IN): value used for initialization
- * @return     none
- ************************************************************************
-*/
-
-M4OSA_Void M4OSA_memset(M4OSA_MemAddr8 block,
-                        M4OSA_UInt32 size,
-                        M4OSA_UInt8 value)
-{
-    memset((void*)block, value, size);
-}
-
-
-/**
- ************************************************************************
- * @fn         M4OSA_Void M4OSA_memcpy(M4OSA_MemAddr8 outputBlock,
- *                                     M4OSA_MemAddr8 inputBlock,
- *                                     M4OSA_UInt32 size)
- * @brief      this function copies 'size' bytes from inputBlock to outputBlock
- * @note
- * @param      outputBlock (IN): address of block to fill
- * @param      inputBlock  (IN): address of the input block
- * @param      size (IN): size of the block to copy (in bytes)
- * @return     none
- ************************************************************************
-*/
-
-M4OSA_Void M4OSA_memcpy(M4OSA_MemAddr8 outputBlock,
-                        M4OSA_MemAddr8 inputBlock,
-                        M4OSA_UInt32 size)
-{
-    memcpy((void*)outputBlock, (void*)inputBlock,  size);
-}
-
-/**
- ************************************************************************
- * @fn         M4OSA_MemAddr8 M4OSA_memmove(M4OSA_MemAddr8 outputBlock, M4OSA_MemAddr8 inputBlock, M4OSA_UInt32 size)
- * @brief      this function moves 'size' bytes from inputBlock to outputBlock
- *               unlike M4OSA_memcpy, the two buffers can have an overlap.
- * @note       increment memcpy byte number (François VALETTE)
- * @param      outputBlock (IN): address of block to fill
- * @param      inputBlock  (IN): address of the input block
- * @param      size (IN): size of the block to copy (in bytes)
- * @return     address of the output block, i.e. the first parameter
- ************************************************************************
-*/
-M4OSA_MemAddr8 M4OSA_memmove(M4OSA_MemAddr8 outputBlock,
-                         M4OSA_MemAddr8 inputBlock,
-                         M4OSA_UInt32 size)
-{
-   return memmove((void*)outputBlock, (void*)inputBlock,  size);
-}
-
-/**
- ************************************************************************
- * @fn         M4OSA_Int32 M4OSA_memcmp(M4OSA_MemAddr8 address1, M4OSA_MemAddr8 address2, M4OSA_UInt32 size)
- * @brief      this function compares the first 'size' bytes of address1 and
-               'address2' and return a value indicating their relationship.
- * @note
- * @param      address1 (IN): memory address 1
- * @param      address2 (IN): memory address 2
- * @param      size (IN): size of the block to compare (in bytes)
- * @return     +1, if first bytes of adress1 are smaller than those of address2
- * @return      0, if both blocks are identical
- * @return    -1, if first bytes of address1 are bigger than those of address2
- ************************************************************************
-*/
-
-M4OSA_Int32 M4OSA_memcmp(M4OSA_MemAddr8 address1,
-                         M4OSA_MemAddr8 address2,
-                         M4OSA_UInt32 size)
-{
-    M4OSA_Int32 i32_result = memcmp(address1, address2, size);
-    if (i32_result > 0) {
-        return 1;
-    }
-    else if (i32_result < 0) {
-        return((M4OSA_Int32)-1);
-    }
-    return 0;
-}
-
-
-
-
 #endif
 
diff --git a/libvideoeditor/vss/3gpwriter/src/M4MP4W_Utils.c b/libvideoeditor/vss/3gpwriter/src/M4MP4W_Utils.c
index 5da85eb..55ddc4c 100755
--- a/libvideoeditor/vss/3gpwriter/src/M4MP4W_Utils.c
+++ b/libvideoeditor/vss/3gpwriter/src/M4MP4W_Utils.c
@@ -123,7 +123,7 @@ void* M4MP4W_realloc(M4OSA_MemAddr32 ptr, M4OSA_UInt32 oldSize, M4OSA_UInt32 new
                                                           (M4OSA_Char *)"realloc");
     if (M4OSA_NULL != ptr2)
     {
-        M4OSA_memcpy((M4OSA_MemAddr8)ptr2, (M4OSA_MemAddr8)ptr, oldSize);
+        memcpy((void *)ptr2, (void *)ptr, oldSize);
     }
     M4OSA_free(ptr);
     return ptr2;
diff --git a/libvideoeditor/vss/3gpwriter/src/M4MP4W_Writer.c b/libvideoeditor/vss/3gpwriter/src/M4MP4W_Writer.c
index b37dded..9c2ee1d 100755
--- a/libvideoeditor/vss/3gpwriter/src/M4MP4W_Writer.c
+++ b/libvideoeditor/vss/3gpwriter/src/M4MP4W_Writer.c
@@ -614,8 +614,8 @@ M4OSA_ERR M4MP4W_openWrite(M4OSA_Context *contextPtr,
 
     /* ftyp atom */
 
-    M4OSA_memset((M4OSA_MemAddr8) &mMp4FileDataPtr->ftyp,
-        sizeof(mMp4FileDataPtr->ftyp), 0);
+    memset((void *) &mMp4FileDataPtr->ftyp,0,
+        sizeof(mMp4FileDataPtr->ftyp));
 
     *contextPtr = mMp4FileDataPtr;
 
@@ -784,9 +784,9 @@ M4OSA_ERR M4MP4W_addStream(M4OSA_Context context,
                         (M4OSA_Char *)"audioTrackPtr->DSI");
                     ERR_CHECK(mMp4FileDataPtr->audioTrackPtr->DSI != M4OSA_NULL,
                         M4ERR_ALLOC);
-                    M4OSA_memcpy(
-                        (M4OSA_MemAddr8)mMp4FileDataPtr->audioTrackPtr->DSI,
-                        (M4OSA_MemAddr8)streamDescPtr->decoderSpecificInfo,
+                    memcpy(
+                        (void *)mMp4FileDataPtr->audioTrackPtr->DSI,
+                        (void *)streamDescPtr->decoderSpecificInfo,
                         9);
                 }
                 else
@@ -819,9 +819,9 @@ M4OSA_ERR M4MP4W_addStream(M4OSA_Context context,
                         (M4OSA_Char *)"audioTrackPtr->DSI");
                     ERR_CHECK(mMp4FileDataPtr->audioTrackPtr->DSI != M4OSA_NULL,
                         M4ERR_ALLOC);
-                    M4OSA_memcpy(
-                        (M4OSA_MemAddr8)mMp4FileDataPtr->audioTrackPtr->DSI,
-                        (M4OSA_MemAddr8)streamDescPtr->decoderSpecificInfo,
+                    memcpy(
+                        (void *)mMp4FileDataPtr->audioTrackPtr->DSI,
+                        (void *)streamDescPtr->decoderSpecificInfo,
                         6);
                 }
                 else
@@ -854,9 +854,9 @@ M4OSA_ERR M4MP4W_addStream(M4OSA_Context context,
                         M4MP4_WRITER, (M4OSA_Char *)"audioTrackPtr->DSI");
                     ERR_CHECK(mMp4FileDataPtr->audioTrackPtr->DSI != M4OSA_NULL,
                         M4ERR_ALLOC);
-                    M4OSA_memcpy(
-                        (M4OSA_MemAddr8)mMp4FileDataPtr->audioTrackPtr->DSI,
-                        (M4OSA_MemAddr8)streamDescPtr->decoderSpecificInfo,
+                    memcpy(
+                        (void *)mMp4FileDataPtr->audioTrackPtr->DSI,
+                        (void *)streamDescPtr->decoderSpecificInfo,
                         streamDescPtr->decoderSpecificInfoSize);
                 }
                 else
@@ -1055,9 +1055,9 @@ M4OSA_ERR M4MP4W_addStream(M4OSA_Context context,
                         M4MP4_WRITER, (M4OSA_Char *)"videoTrackPtr->DSI");
                     ERR_CHECK(mMp4FileDataPtr->videoTrackPtr->DSI != M4OSA_NULL,
                         M4ERR_ALLOC);
-                    M4OSA_memcpy(
-                        (M4OSA_MemAddr8)mMp4FileDataPtr->videoTrackPtr->DSI,
-                        (M4OSA_MemAddr8)streamDescPtr->decoderSpecificInfo,
+                    memcpy(
+                        (void *)mMp4FileDataPtr->videoTrackPtr->DSI,
+                        (void *)streamDescPtr->decoderSpecificInfo,
                         streamDescPtr->decoderSpecificInfoSize);
                 }
                 else
@@ -1095,9 +1095,9 @@ M4OSA_ERR M4MP4W_addStream(M4OSA_Context context,
                         M4MP4_WRITER, (M4OSA_Char *)"videoTrackPtr->DSI");
                     ERR_CHECK(mMp4FileDataPtr->videoTrackPtr->DSI != M4OSA_NULL,
                         M4ERR_ALLOC);
-                    M4OSA_memcpy(
-                        (M4OSA_MemAddr8)mMp4FileDataPtr->videoTrackPtr->DSI,
-                        (M4OSA_MemAddr8)streamDescPtr->decoderSpecificInfo,
+                    memcpy(
+                        (void *)mMp4FileDataPtr->videoTrackPtr->DSI,
+                        (void *)streamDescPtr->decoderSpecificInfo,
                         streamDescPtr->decoderSpecificInfoSize);
                     mMp4FileDataPtr->filesize +=
                         streamDescPtr->decoderSpecificInfoSize;
@@ -1143,25 +1143,25 @@ M4OSA_ERR M4MP4W_addStream(M4OSA_Context context,
                             (M4OSA_UInt16 *)streamDescPtr->decoderSpecificInfo;
                         SPSLength = DSI[6];
                         PPSLength = DSI[10];
-                        M4OSA_memcpy(
-                            (M4OSA_MemAddr8)mMp4FileDataPtr->videoTrackPtr->DSI,
-                            (M4OSA_MemAddr8)(streamDescPtr->
-                            decoderSpecificInfo)+12, 2);
-                        M4OSA_memcpy(
-                            (M4OSA_MemAddr8)(mMp4FileDataPtr->videoTrackPtr->
-                            DSI)+2, (M4OSA_MemAddr8)(streamDescPtr->
-                            decoderSpecificInfo)+28, SPSLength);
-
-                        M4OSA_memcpy(
-                            (M4OSA_MemAddr8)(mMp4FileDataPtr->videoTrackPtr->
-                            DSI)+2 + SPSLength,
-                            (M4OSA_MemAddr8)(streamDescPtr->
-                            decoderSpecificInfo)+20, 2);
-                        M4OSA_memcpy(
-                            (M4OSA_MemAddr8)(mMp4FileDataPtr->videoTrackPtr->
-                            DSI)+4 + SPSLength,
-                            (M4OSA_MemAddr8)(streamDescPtr->
-                            decoderSpecificInfo)+28 + SPSLength,
+                        memcpy(
+                            (void *)mMp4FileDataPtr->videoTrackPtr->DSI,
+                            (void *)((streamDescPtr->
+                            decoderSpecificInfo)+12), 2);
+                        memcpy(
+                            (void *)((mMp4FileDataPtr->videoTrackPtr->
+                            DSI)+2), (void *)((streamDescPtr->
+                            decoderSpecificInfo)+28), SPSLength);
+
+                        memcpy(
+                            (void *)((mMp4FileDataPtr->videoTrackPtr->
+                            DSI)+2 + SPSLength),
+                            (void *)((streamDescPtr->
+                            decoderSpecificInfo)+20), 2);
+                        memcpy(
+                            (void *)((mMp4FileDataPtr->videoTrackPtr->
+                            DSI)+4 + SPSLength),
+                            (void *)((streamDescPtr->
+                            decoderSpecificInfo)+28 + SPSLength),
                             PPSLength);
                         /* - H.264 trimming */
                     }
@@ -1178,9 +1178,9 @@ M4OSA_ERR M4MP4W_addStream(M4OSA_Context context,
                             M4MP4_WRITER, (M4OSA_Char *)"videoTrackPtr->DSI");
                         ERR_CHECK(mMp4FileDataPtr->videoTrackPtr->DSI
                             != M4OSA_NULL, M4ERR_ALLOC);
-                        M4OSA_memcpy(
-                            (M4OSA_MemAddr8)mMp4FileDataPtr->videoTrackPtr->DSI,
-                            (M4OSA_MemAddr8)streamDescPtr->
+                        memcpy(
+                            (void *)mMp4FileDataPtr->videoTrackPtr->DSI,
+                            (void *)streamDescPtr->
                             decoderSpecificInfo,
                             streamDescPtr->decoderSpecificInfoSize);
                     }
@@ -1363,8 +1363,7 @@ M4OSA_ERR M4MP4W_startWriting( M4OSA_Context context )
             safetyFileSize += mMp4FileDataPtr->audioTrackPtr->MaxChunkSize;
         }
 
-        M4OSA_memset(dummyData, sizeof(dummyData),
-            0xCA); /* For extra safety. */
+        memset((void *)dummyData, 0xCA,sizeof(dummyData)); /* For extra safety. */
 
         for ( i = 0;
             i < (safetyFileSize + sizeof(dummyData) - 1) / sizeof(dummyData);
@@ -4707,11 +4706,11 @@ M4OSA_ERR M4MP4W_getOption( M4OSA_Context context, M4OSA_OptionID option,
         memAddrPtr->size = 16;
         /*if no value was set, return the default string */
         if (mMp4FileDataPtr->embeddedString != M4OSA_NULL)
-            M4OSA_memcpy((M4OSA_MemAddr8)memAddrPtr->addr,
-            (M4OSA_MemAddr8)mMp4FileDataPtr->embeddedString, 16);
+            memcpy((void *)memAddrPtr->addr,
+            (void *)mMp4FileDataPtr->embeddedString, 16);
         else
-            M4OSA_memcpy((M4OSA_MemAddr8)memAddrPtr->addr,
-            (M4OSA_MemAddr8)BlockSignatureSkipDefaultEmbeddedString,
+            memcpy((void *)memAddrPtr->addr,
+            (void *)BlockSignatureSkipDefaultEmbeddedString,
             16);
         break;
 
@@ -4725,11 +4724,11 @@ M4OSA_ERR M4MP4W_getOption( M4OSA_Context context, M4OSA_OptionID option,
         memAddrPtr->size = 60;
         /*if no value was set, return the default string 0 */
         if (mMp4FileDataPtr->integrationTag != M4OSA_NULL)
-            M4OSA_memcpy((M4OSA_MemAddr8)memAddrPtr->addr,
-            (M4OSA_MemAddr8)mMp4FileDataPtr->integrationTag, 60);
+            memcpy((void *)memAddrPtr->addr,
+            (void *)mMp4FileDataPtr->integrationTag, 60);
         else
-            M4OSA_memcpy((M4OSA_MemAddr8)memAddrPtr->addr,
-            (M4OSA_MemAddr8)BlockSignatureSkipDefaultIntegrationTag,
+            memcpy((void *)memAddrPtr->addr,
+            (void *)BlockSignatureSkipDefaultIntegrationTag,
             60);
         break;
 
@@ -4962,8 +4961,8 @@ M4OSA_ERR M4MP4W_setOption( M4OSA_Context context, M4OSA_OptionID option,
                     M4ERR_ALLOC);
             }
             /*else, just overwrite the previously set string*/
-            M4OSA_memcpy((M4OSA_MemAddr8)mMp4FileDataPtr->embeddedString,
-                (M4OSA_MemAddr8)memAddrPtr->addr, 16);
+            memcpy((void *)mMp4FileDataPtr->embeddedString,
+                (void *)memAddrPtr->addr, 16);
             break;
 
         case (M4MP4W_integrationTag):
@@ -4983,16 +4982,16 @@ M4OSA_ERR M4MP4W_setOption( M4OSA_Context context, M4OSA_OptionID option,
             /*else, just overwrite the previously set string*/
             if (memAddrPtr->size < 60)
             {
-                M4OSA_memcpy((M4OSA_MemAddr8)mMp4FileDataPtr->integrationTag,
-                    (M4OSA_MemAddr8)BlockSignatureSkipDefaultIntegrationTag,
+                memcpy((void *)mMp4FileDataPtr->integrationTag,
+                    (void *)BlockSignatureSkipDefaultIntegrationTag,
                     60);
-                M4OSA_memcpy((M4OSA_MemAddr8)mMp4FileDataPtr->integrationTag,
-                    (M4OSA_MemAddr8)memAddrPtr->addr, memAddrPtr->size);
+                memcpy((void *)mMp4FileDataPtr->integrationTag,
+                    (void *)memAddrPtr->addr, memAddrPtr->size);
             }
             else
             {
-                M4OSA_memcpy((M4OSA_MemAddr8)mMp4FileDataPtr->integrationTag,
-                    (M4OSA_MemAddr8)memAddrPtr->addr, 60);
+                memcpy((void *)mMp4FileDataPtr->integrationTag,
+                    (void *)memAddrPtr->addr, 60);
             }
             break;
 
@@ -5184,10 +5183,10 @@ M4OSA_ERR M4MP4W_setOption( M4OSA_Context context, M4OSA_OptionID option,
                                     M4MP4_WRITER, (M4OSA_Char *)"videoTrackPtr->DSI");
                                 ERR_CHECK(mMp4FileDataPtr->videoTrackPtr->DSI
                                     != M4OSA_NULL, M4ERR_ALLOC);
-                                M4OSA_memcpy(
-                                    (M4OSA_MemAddr8)mMp4FileDataPtr->videoTrackPtr->
+                                memcpy(
+                                    (void *)mMp4FileDataPtr->videoTrackPtr->
                                     DSI,
-                                    (M4OSA_MemAddr8)streamIDmemAddrPtr->addr,
+                                    (void *)streamIDmemAddrPtr->addr,
                                     streamIDmemAddrPtr->size);
 
                                 break;
@@ -5220,10 +5219,10 @@ M4OSA_ERR M4MP4W_setOption( M4OSA_Context context, M4OSA_OptionID option,
                                     M4MP4_WRITER, (M4OSA_Char *)"videoTrackPtr->DSI");
                                 ERR_CHECK(mMp4FileDataPtr->videoTrackPtr->DSI
                                     != M4OSA_NULL, M4ERR_ALLOC);
-                                M4OSA_memcpy(
-                                    (M4OSA_MemAddr8)mMp4FileDataPtr->videoTrackPtr->
+                                memcpy(
+                                    (void *)mMp4FileDataPtr->videoTrackPtr->
                                     DSI,
-                                    (M4OSA_MemAddr8)streamIDmemAddrPtr->addr,
+                                    (void *)streamIDmemAddrPtr->addr,
                                     streamIDmemAddrPtr->size);
                                 mMp4FileDataPtr->filesize +=
                                     streamIDmemAddrPtr->size;
@@ -5254,9 +5253,9 @@ M4OSA_ERR M4MP4W_setOption( M4OSA_Context context, M4OSA_OptionID option,
                                             (M4OSA_Char *)"videoTrackPtr->DSI");
                                         ERR_CHECK(mMp4FileDataPtr->videoTrackPtr->DSI !=
                                              M4OSA_NULL, M4ERR_ALLOC);
-                                        M4OSA_memcpy(
-                                            (M4OSA_MemAddr8)mMp4FileDataPtr->videoTrackPtr->DSI,
-                                            (M4OSA_MemAddr8)streamIDmemAddrPtr->addr,
+                                        memcpy(
+                                            (void *)mMp4FileDataPtr->videoTrackPtr->DSI,
+                                            (void *)streamIDmemAddrPtr->addr,
                                             streamIDmemAddrPtr->size);
 
                                         break;
@@ -5288,10 +5287,10 @@ M4OSA_ERR M4MP4W_setOption( M4OSA_Context context, M4OSA_OptionID option,
                                     M4MP4_WRITER, (M4OSA_Char *)"videoTrackPtr->DSI");
                                 ERR_CHECK(mMp4FileDataPtr->videoTrackPtr->DSI
                                     != M4OSA_NULL, M4ERR_ALLOC);
-                                M4OSA_memcpy(
-                                    (M4OSA_MemAddr8)mMp4FileDataPtr->videoTrackPtr->
+                                memcpy(
+                                    (void *)mMp4FileDataPtr->videoTrackPtr->
                                     DSI,
-                                    (M4OSA_MemAddr8)streamIDmemAddrPtr->addr,
+                                    (void *)streamIDmemAddrPtr->addr,
                                     streamIDmemAddrPtr->size);
                                 break;
 
diff --git a/libvideoeditor/vss/mcs/src/M4MCS_API.c b/libvideoeditor/vss/mcs/src/M4MCS_API.c
index 981662c..a4c3ed7 100644..100755
--- a/libvideoeditor/vss/mcs/src/M4MCS_API.c
+++ b/libvideoeditor/vss/mcs/src/M4MCS_API.c
@@ -756,8 +756,8 @@ M4OSA_ERR H264MCS_ProcessEncodedNALU(   M4OSA_Void *ainstance,
 
     // StageFright codecs may add a start code, make sure it is not present
 
-    if( !M4OSA_memcmp((M4OSA_MemAddr8)inbuff,
-        (M4OSA_MemAddr8)"\x00\x00\x00\x01", 4) )
+    if( !memcmp((void *)inbuff,
+        "\x00\x00\x00\x01", 4) )
     {
         M4OSA_TRACE1_3(
             "H264MCS_ProcessNALU ERROR : NALU start code has not been removed %d "
@@ -770,7 +770,7 @@ M4OSA_ERR H264MCS_ProcessEncodedNALU(   M4OSA_Void *ainstance,
     // StageFright encoder does not provide the size in the first 4 bytes of the AU, add it
     pTmpBuff1 = (M4OSA_Int8 *)M4OSA_malloc(inbuf_size + 4, M4MCS,
         (M4OSA_Char *)"tmpNALU");
-    M4OSA_memcpy((M4OSA_MemAddr8)(pTmpBuff1 + 4), (M4OSA_MemAddr8)inbuff,
+    memcpy((void *)(pTmpBuff1 + 4), (void *)inbuff,
         inbuf_size);
     pTmpBuff1[3] = ( (M4OSA_UInt32)inbuf_size) & 0x000000FF;
     pTmpBuff1[2] = ( (M4OSA_UInt32)inbuf_size >> 8) & 0x000000FF;
@@ -1576,8 +1576,8 @@ M4OSA_ERR H264MCS_ProcessSPS_PPS( NSWAVC_MCS_t *instance, M4OSA_UInt8 *inbuff,
         }
 
         instance->m_pFinalDSISize = instance->m_decoderSpecificInfoSize;
-        M4OSA_memcpy((M4OSA_MemAddr8)instance->m_pFinalDSI,
-            (M4OSA_MemAddr8)instance->m_pDecoderSpecificInfo,
+        memcpy((void *)instance->m_pFinalDSI,
+            (void *)instance->m_pDecoderSpecificInfo,
             instance->m_decoderSpecificInfoSize);
     }
     else
@@ -1605,8 +1605,8 @@ M4OSA_ERR H264MCS_ProcessSPS_PPS( NSWAVC_MCS_t *instance, M4OSA_UInt8 *inbuff,
             return M4ERR_ALLOC;
         }
 
-        M4OSA_memcpy((M4OSA_MemAddr8)instance->m_pFinalDSI,
-            (M4OSA_MemAddr8)instance->m_pDecoderSpecificInfo,
+        memcpy((void *)instance->m_pFinalDSI,
+            (void *)instance->m_pDecoderSpecificInfo,
             instance->m_decoderSpecificInfoSize);
 
         temp = instance->m_pFinalDSI[lClipDSI_PPS_offset];
@@ -1955,8 +1955,8 @@ M4OSA_ERR H264MCS_ProcessNALU( NSWAVC_MCS_t *ainstance, M4OSA_UInt8 *inbuff,
         else
         {
             p_bs->Buffer = p_bs->Buffer - 5;
-            M4OSA_memcpy((M4OSA_MemAddr8) &outbuff[outbuffpos],
-                (M4OSA_MemAddr8)p_bs->Buffer, nal_size + 4);
+            memcpy((void *) &outbuff[outbuffpos],
+                (void *)p_bs->Buffer, nal_size + 4);
 
             outbuff[outbuffpos] = (M4OSA_UInt8)((nal_size >> 24)& 0xFF);
         outbuff[outbuffpos + 1] = (M4OSA_UInt8)((nal_size >> 16)& 0xFF);;
@@ -3173,8 +3173,8 @@ M4OSA_ERR M4MCS_close( M4MCS_Context pContext )
                         M4OSA_TRACE1_0("instance->m_pFinalDSI: allocation error");
                         return M4ERR_ALLOC;
                     }
-                    M4OSA_memcpy((M4OSA_MemAddr8)pC->m_pInstance->m_pFinalDSI,
-                        (M4OSA_MemAddr8)pC-> \
+                    memcpy((void *)pC->m_pInstance->m_pFinalDSI,
+                        (void *)pC-> \
                         m_pInstance->m_pDecoderSpecificInfo,
                         pC->m_pInstance->m_decoderSpecificInfoSize);
                 }
@@ -3577,8 +3577,8 @@ M4OSA_ERR M4MCS_getInputFileProperties( M4MCS_Context pContext,
 
     /**
     * Copy previously computed properties into given structure */
-    M4OSA_memcpy((M4OSA_MemAddr8)pFileProperties,
-        (M4OSA_MemAddr8) &pC->InputFileProperties,
+    memcpy((void *)pFileProperties,
+        (void *) &pC->InputFileProperties,
         sizeof(M4VIDEOEDITING_ClipProperties));
 
     return M4NO_ERROR;
@@ -4319,8 +4319,8 @@ M4OSA_ERR M4MCS_setOutputParams( M4MCS_Context pContext,
         for ( j = 0; j < pC->nbEffects; j++ )
         {
             /* Copy effect to "local" structure */
-            M4OSA_memcpy((M4OSA_MemAddr8) &(pC->pEffects[j]),
-                (M4OSA_MemAddr8) &(pParams->pEffects[j]),
+            memcpy((void *) &(pC->pEffects[j]),
+                (void *) &(pParams->pEffects[j]),
                 sizeof(M4MCS_EffectSettings));
 
             switch( pC->pEffects[j].AudioEffectType )
@@ -6804,8 +6804,8 @@ static M4OSA_ERR M4MCS_intPrepareWriter( M4MCS_InternalContext *pC )
                 }
 
                 /* Copy Reading DSI to new DSI */
-                M4OSA_memcpy(pC->WriterVideoStreamInfo.Header.pBuf,
-                    pC->pReaderVideoStream->
+                memcpy((void *)pC->WriterVideoStreamInfo.Header.pBuf,
+                    (void *)pC->pReaderVideoStream->
                     m_basicProperties.m_pDecoderSpecificInfo,
                     pC->WriterVideoStreamInfo.Header.Size);
 
@@ -7986,8 +7986,8 @@ static M4OSA_ERR M4MCS_intAudioNullEncoding( M4MCS_InternalContext *pC )
                     pC->ReaderAudioAU1.m_maxsize;
             }
             /**/
-            M4OSA_memcpy((M4OSA_MemAddr8)pC->m_pDataAddress1,
-                (M4OSA_MemAddr8)pC->ReaderAudioAU1.m_dataAddress,
+            memcpy((void *)pC->m_pDataAddress1,
+                (void *)pC->ReaderAudioAU1.m_dataAddress,
                 pC->ReaderAudioAU1.m_size);
         }
 
@@ -8021,8 +8021,8 @@ static M4OSA_ERR M4MCS_intAudioNullEncoding( M4MCS_InternalContext *pC )
         * Read the next audio AU in the input file */
         if( pC->ReaderAudioAU2.m_CTS > pC->ReaderAudioAU1.m_CTS )
         {
-            M4OSA_memcpy((M4OSA_MemAddr8) &pC->ReaderAudioAU,
-                (M4OSA_MemAddr8) &pC->ReaderAudioAU2, sizeof(M4_AccessUnit));
+            memcpy((void *) &pC->ReaderAudioAU,
+                (void *) &pC->ReaderAudioAU2, sizeof(M4_AccessUnit));
             err = pC->m_pReaderDataIt->m_pFctGetNextAu(pC->pReaderContext,
                 (M4_StreamHandler *)pC->pReaderAudioStream,
                 &pC->ReaderAudioAU1);
@@ -8050,8 +8050,8 @@ static M4OSA_ERR M4MCS_intAudioNullEncoding( M4MCS_InternalContext *pC )
                     pC->ReaderAudioAU1.m_maxsize;
             }
             /**/
-            M4OSA_memcpy((M4OSA_MemAddr8)pC->m_pDataAddress1,
-                (M4OSA_MemAddr8)pC->ReaderAudioAU1.m_dataAddress,
+            memcpy((void *)pC->m_pDataAddress1,
+                (void *)pC->ReaderAudioAU1.m_dataAddress,
                 pC->ReaderAudioAU1.m_size);
             pC->m_audioAUDuration =
                 pC->ReaderAudioAU1.m_CTS - pC->ReaderAudioAU2.m_CTS;
@@ -8059,8 +8059,8 @@ static M4OSA_ERR M4MCS_intAudioNullEncoding( M4MCS_InternalContext *pC )
         }
         else
         {
-            M4OSA_memcpy((M4OSA_MemAddr8) &pC->ReaderAudioAU,
-                (M4OSA_MemAddr8) &pC->ReaderAudioAU1, sizeof(M4_AccessUnit));
+            memcpy((void *) &pC->ReaderAudioAU,
+                (void *) &pC->ReaderAudioAU1, sizeof(M4_AccessUnit));
             err = pC->m_pReaderDataIt->m_pFctGetNextAu(pC->pReaderContext,
                 (M4_StreamHandler *)pC->pReaderAudioStream,
                 &pC->ReaderAudioAU2);
@@ -8089,8 +8089,8 @@ static M4OSA_ERR M4MCS_intAudioNullEncoding( M4MCS_InternalContext *pC )
                     pC->ReaderAudioAU2.m_maxsize;
             }
             /**/
-            M4OSA_memcpy((M4OSA_MemAddr8)pC->m_pDataAddress2,
-                (M4OSA_MemAddr8)pC->ReaderAudioAU2.m_dataAddress,
+            memcpy((void *)pC->m_pDataAddress2,
+                (void *)pC->ReaderAudioAU2.m_dataAddress,
                 pC->ReaderAudioAU2.m_size);
             pC->m_audioAUDuration =
                 pC->ReaderAudioAU2.m_CTS - pC->ReaderAudioAU1.m_CTS;
@@ -8142,15 +8142,15 @@ static M4OSA_ERR M4MCS_intAudioNullEncoding( M4MCS_InternalContext *pC )
             if( pC->InputFileProperties.uiNbChannels == 1 )
             {
                 pC->WriterAudioAU.size = M4VSS3GPP_AAC_AU_SILENCE_MONO_SIZE;
-                M4OSA_memcpy((M4OSA_MemAddr8)pC->WriterAudioAU.dataAddress,
-                    (M4OSA_MemAddr8)M4VSS3GPP_AAC_AU_SILENCE_MONO,
+                memcpy((void *)pC->WriterAudioAU.dataAddress,
+                    (void *)M4VSS3GPP_AAC_AU_SILENCE_MONO,
                     pC->WriterAudioAU.size);
             }
             else if( pC->InputFileProperties.uiNbChannels == 2 )
             {
                 pC->WriterAudioAU.size = M4VSS3GPP_AAC_AU_SILENCE_STEREO_SIZE;
-                M4OSA_memcpy((M4OSA_MemAddr8)pC->WriterAudioAU.dataAddress,
-                    (M4OSA_MemAddr8)M4VSS3GPP_AAC_AU_SILENCE_STEREO,
+                memcpy((void *)pC->WriterAudioAU.dataAddress,
+                    (void *)M4VSS3GPP_AAC_AU_SILENCE_STEREO,
                     pC->WriterAudioAU.size);
             }
             else
@@ -8165,17 +8165,17 @@ static M4OSA_ERR M4MCS_intAudioNullEncoding( M4MCS_InternalContext *pC )
             == M4VIDEOEDITING_kAMR_NB )
         {
             pC->WriterAudioAU.size = M4VSS3GPP_AMR_AU_SILENCE_FRAME_048_SIZE;
-            M4OSA_memcpy((M4OSA_MemAddr8)pC->WriterAudioAU.dataAddress,
-                (M4OSA_MemAddr8)M4VSS3GPP_AMR_AU_SILENCE_FRAME_048,
+            memcpy((void *)pC->WriterAudioAU.dataAddress,
+                (void *)M4VSS3GPP_AMR_AU_SILENCE_FRAME_048,
                 pC->WriterAudioAU.size);
             /* Some remaining AMR AU needs to be copied */
             if( pC->ReaderAudioAU.m_size != 0 )
             {
                 /* Update Writer AU */
                 pC->WriterAudioAU.size += pC->ReaderAudioAU.m_size;
-                M4OSA_memcpy((M4OSA_MemAddr8)pC->WriterAudioAU.dataAddress
-                    + M4VSS3GPP_AMR_AU_SILENCE_FRAME_048_SIZE,
-                    (M4OSA_MemAddr8)pC->ReaderAudioAU.m_dataAddress,
+                memcpy((void *)(pC->WriterAudioAU.dataAddress
+                    + M4VSS3GPP_AMR_AU_SILENCE_FRAME_048_SIZE),
+                    (void *)pC->ReaderAudioAU.m_dataAddress,
                     pC->ReaderAudioAU.m_size);
             }
         }
@@ -8185,8 +8185,8 @@ static M4OSA_ERR M4MCS_intAudioNullEncoding( M4MCS_InternalContext *pC )
             M4OSA_TRACE3_1(
                 "M4MCS_intAudioNullEncoding(): Copying audio AU: size=%d",
                 pC->ReaderAudioAU.m_size);
-            M4OSA_memcpy((M4OSA_MemAddr8)pC->WriterAudioAU.dataAddress,
-                (M4OSA_MemAddr8)pC->ReaderAudioAU.m_dataAddress,
+            memcpy((void *)pC->WriterAudioAU.dataAddress,
+                (void *)pC->ReaderAudioAU.m_dataAddress,
                 pC->ReaderAudioAU.m_size);
             pC->WriterAudioAU.size = pC->ReaderAudioAU.m_size;
         }
@@ -8198,8 +8198,8 @@ static M4OSA_ERR M4MCS_intAudioNullEncoding( M4MCS_InternalContext *pC )
         M4OSA_TRACE3_1(
             "M4MCS_intAudioNullEncoding(): Copying audio AU: size=%d",
             pC->ReaderAudioAU.m_size);
-        M4OSA_memcpy((M4OSA_MemAddr8)pC->WriterAudioAU.dataAddress,
-            (M4OSA_MemAddr8)pC->ReaderAudioAU.m_dataAddress,
+        memcpy((void *)pC->WriterAudioAU.dataAddress,
+            (void *)pC->ReaderAudioAU.m_dataAddress,
             pC->ReaderAudioAU.m_size);
         pC->WriterAudioAU.size = pC->ReaderAudioAU.m_size;
     }
@@ -8421,7 +8421,7 @@ m4mcs_intaudiotranscoding_feed_resampler:
 
     /**
     * Copy from the decoder out buffer into the Ssrc in buffer */
-    M4OSA_memcpy(pC->pPosInSsrcBufferIn, pC->pPosInDecBufferOut,
+    memcpy((void *)pC->pPosInSsrcBufferIn, (void *)pC->pPosInDecBufferOut,
         uiDecoder2Ssrc_NbBytes);
 
     /**
@@ -8471,16 +8471,16 @@ m4mcs_intaudiotranscoding_do_resampling:
             (short *)M4OSA_malloc((pC->iSsrcNbSamplOut * sizeof(short) * 2
             * ((*pC).InputFileProperties).uiNbChannels),
             M4VSS3GPP,(M4OSA_Char *) "tempBuffOut");
-        M4OSA_memset((M4OSA_MemAddr8)tempBuffOut, (pC->iSsrcNbSamplOut * sizeof(short) * 2
-            * ((*pC).InputFileProperties).uiNbChannels), 0);
+        memset((void *)tempBuffOut, 0,(pC->iSsrcNbSamplOut * sizeof(short) * 2
+            * ((*pC).InputFileProperties).uiNbChannels));
 
         LVAudioresample_LowQuality((short *)tempBuffOut, (short *)pSsrcInput,
             pC->iSsrcNbSamplOut, pC->pLVAudioResampler);
     }
     else
     {
-        M4OSA_memset(pC->pSsrcBufferOut, (pC->iSsrcNbSamplOut * sizeof(short)
-            * ((*pC).InputFileProperties).uiNbChannels), 0);
+        memset((void *)pC->pSsrcBufferOut, 0, (pC->iSsrcNbSamplOut * sizeof(short)
+            * ((*pC).InputFileProperties).uiNbChannels));
 
         LVAudioresample_LowQuality((short *)pC->pSsrcBufferOut,
             (short *)pSsrcInput, pC->iSsrcNbSamplOut, pC->pLVAudioResampler);
@@ -8607,7 +8607,7 @@ m4mcs_intaudiotranscoding_prepare_input_buffer:
     else
     {
         /* copy from the ssrc out buffer into the encoder in buffer */
-        M4OSA_memcpy(pC->pPosInAudioEncoderBuffer, pC->pPosInSsrcBufferOut,
+        memcpy((void *)pC->pPosInAudioEncoderBuffer, (void *)pC->pPosInSsrcBufferOut,
             uiSsrc2Encoder_NbBytes);
     }
 
@@ -9081,8 +9081,8 @@ static M4OSA_ERR M4MCS_intVideoNullEncoding( M4MCS_InternalContext *pC )
             pC->pReaderVideoStream->m_basicProperties.m_maxAUSize =
                 pC->ReaderVideoAU1.m_maxsize;
         }
-        M4OSA_memcpy((M4OSA_MemAddr8)pC->m_pDataVideoAddress1,
-            (M4OSA_MemAddr8)pC->ReaderVideoAU1.m_dataAddress,
+        memcpy((void *)pC->m_pDataVideoAddress1,
+            (void *)pC->ReaderVideoAU1.m_dataAddress,
             pC->ReaderVideoAU1.m_size);
     }
 
@@ -9115,8 +9115,8 @@ static M4OSA_ERR M4MCS_intVideoNullEncoding( M4MCS_InternalContext *pC )
     * Read the next video AU in the input file */
     if( pC->ReaderVideoAU2.m_CTS > pC->ReaderVideoAU1.m_CTS )
     {
-        M4OSA_memcpy((M4OSA_MemAddr8) &pC->ReaderVideoAU,
-            (M4OSA_MemAddr8) &pC->ReaderVideoAU2, sizeof(M4_AccessUnit));
+        memcpy((void *) &pC->ReaderVideoAU,
+            (void *) &pC->ReaderVideoAU2, sizeof(M4_AccessUnit));
         err = pC->m_pReaderDataIt->m_pFctGetNextAu(pC->pReaderContext,
             (M4_StreamHandler *)pC->pReaderVideoStream,
             &pC->ReaderVideoAU1);
@@ -9141,16 +9141,16 @@ static M4OSA_ERR M4MCS_intVideoNullEncoding( M4MCS_InternalContext *pC )
             pC->pReaderVideoStream->m_basicProperties.m_maxAUSize =
                 pC->ReaderVideoAU1.m_maxsize;
         }
-        M4OSA_memcpy((M4OSA_MemAddr8)pC->m_pDataVideoAddress1,
-            (M4OSA_MemAddr8)pC->ReaderVideoAU1.m_dataAddress,
+        memcpy((void *)pC->m_pDataVideoAddress1,
+            (void *)pC->ReaderVideoAU1.m_dataAddress,
             pC->ReaderVideoAU1.m_size);
         videoAUDuration = pC->ReaderVideoAU1.m_CTS - pC->ReaderVideoAU2.m_CTS;
         pC->ReaderVideoAU.m_dataAddress = pC->m_pDataVideoAddress2;
     }
     else
     {
-        M4OSA_memcpy((M4OSA_MemAddr8) &pC->ReaderVideoAU,
-            (M4OSA_MemAddr8) &pC->ReaderVideoAU1, sizeof(M4_AccessUnit));
+        memcpy((void *) &pC->ReaderVideoAU,
+            (void *) &pC->ReaderVideoAU1, sizeof(M4_AccessUnit));
         err = pC->m_pReaderDataIt->m_pFctGetNextAu(pC->pReaderContext,
             (M4_StreamHandler *)pC->pReaderVideoStream,
             &pC->ReaderVideoAU2);
@@ -9175,8 +9175,8 @@ static M4OSA_ERR M4MCS_intVideoNullEncoding( M4MCS_InternalContext *pC )
             pC->pReaderVideoStream->m_basicProperties.m_maxAUSize =
                 pC->ReaderVideoAU2.m_maxsize;
         }
-        M4OSA_memcpy((M4OSA_MemAddr8)pC->m_pDataVideoAddress2,
-            (M4OSA_MemAddr8)pC->ReaderVideoAU2.m_dataAddress,
+        memcpy((void *)pC->m_pDataVideoAddress2,
+            (void *)pC->ReaderVideoAU2.m_dataAddress,
             pC->ReaderVideoAU2.m_size);
         videoAUDuration = pC->ReaderVideoAU2.m_CTS - pC->ReaderVideoAU1.m_CTS;
         pC->ReaderVideoAU.m_dataAddress = pC->m_pDataVideoAddress1;
@@ -9219,7 +9219,7 @@ static M4OSA_ERR M4MCS_intVideoNullEncoding( M4MCS_InternalContext *pC )
         {
             /**
             * Copy video data from reader AU to writer AU */
-            //M4OSA_memcpy((M4OSA_MemAddr8)pC->WriterVideoAU.dataAddress,
+            //memcpy((M4OSA_MemAddr8)pC->WriterVideoAU.dataAddress,
             //(M4OSA_MemAddr8)pC->ReaderVideoAU.m_dataAddress, pC->ReaderVideoAU.m_size);
             pC->WriterVideoAU.size = pC->ReaderVideoAU.m_size;
 
@@ -9282,8 +9282,8 @@ static M4OSA_ERR M4MCS_intVideoNullEncoding( M4MCS_InternalContext *pC )
                         (M4OSA_UInt8 *)pC->ReaderVideoAU.m_dataAddress ,
                         pC->ReaderVideoAU.m_size);
 
-                    M4OSA_memcpy((M4OSA_MemAddr8)pC->WriterVideoAU.dataAddress,
-                        (M4OSA_MemAddr8)(pC->ReaderVideoAU.m_dataAddress + 4),
+                    memcpy((void *)pC->WriterVideoAU.dataAddress,
+                        (void *)(pC->ReaderVideoAU.m_dataAddress + 4),
                         pC->ReaderVideoAU.m_size - 4);
                     pC->WriterVideoAU.size = pC->ReaderVideoAU.m_size - 4;
                     WritebufferAdd =
@@ -9291,8 +9291,8 @@ static M4OSA_ERR M4MCS_intVideoNullEncoding( M4MCS_InternalContext *pC )
                 }
                 else
                 {
-                    M4OSA_memcpy((M4OSA_MemAddr8)pC->WriterVideoAU.dataAddress,
-                        (M4OSA_MemAddr8)(pC->H264MCSTempBuffer + 4),
+                    memcpy((void *)pC->WriterVideoAU.dataAddress,
+                        (void *)(pC->H264MCSTempBuffer + 4),
                         pC->H264MCSTempBufferDataSize - 4);
                     pC->WriterVideoAU.size = pC->H264MCSTempBufferDataSize - 4;
                     WritebufferAdd =
@@ -9302,8 +9302,8 @@ static M4OSA_ERR M4MCS_intVideoNullEncoding( M4MCS_InternalContext *pC )
             /* H.264 Trimming */
             else
             {
-                M4OSA_memcpy((M4OSA_MemAddr8)pC->WriterVideoAU.dataAddress,
-                    (M4OSA_MemAddr8)pC->ReaderVideoAU.m_dataAddress,
+                memcpy((void *)pC->WriterVideoAU.dataAddress,
+                    (void *)pC->ReaderVideoAU.m_dataAddress,
                     pC->ReaderVideoAU.m_size);
                 pC->WriterVideoAU.size = pC->ReaderVideoAU.m_size;
             }
@@ -9337,13 +9337,13 @@ static M4OSA_ERR M4MCS_intVideoNullEncoding( M4MCS_InternalContext *pC )
         {
             if( pC->m_pInstance->is_done == 1 )
             {
-                M4OSA_memcpy((M4OSA_MemAddr8)(WritebufferAdd - 4),
-                    (M4OSA_MemAddr8)(pC->ReaderVideoAU.m_dataAddress), 4);
+                memcpy((void *)(WritebufferAdd - 4),
+                    (void *)(pC->ReaderVideoAU.m_dataAddress), 4);
             }
             else
             {
-                M4OSA_memcpy((M4OSA_MemAddr8)(WritebufferAdd - 4),
-                    (M4OSA_MemAddr8)(pC->H264MCSTempBuffer), 4);
+                memcpy((void *)(WritebufferAdd - 4),
+                    (void *)(pC->H264MCSTempBuffer), 4);
             }
         } /* H.264 Trimming */
     }
@@ -9487,8 +9487,8 @@ static M4OSA_ERR M4MCS_intGetInputClipProperties( M4MCS_InternalContext *pC )
     pC->InputFileProperties.Version[2] = M4VIDEOEDITING_VERSION_REVISION;
     pC->InputFileProperties.uiClipDuration = 0;
 
-    M4OSA_memset((M4OSA_MemAddr8) &pC->InputFileProperties.ftyp,
-        sizeof(M4VIDEOEDITING_FtypBox), 0);
+    memset((void *) &pC->InputFileProperties.ftyp,
+        0, sizeof(M4VIDEOEDITING_FtypBox));
 
     /**
     * Reset video characteristics */
diff --git a/libvideoeditor/vss/mcs/src/M4MCS_BitstreamParser.c b/libvideoeditor/vss/mcs/src/M4MCS_BitstreamParser.c
index 182e476..8c05191 100755
--- a/libvideoeditor/vss/mcs/src/M4MCS_BitstreamParser.c
+++ b/libvideoeditor/vss/mcs/src/M4MCS_BitstreamParser.c
@@ -547,7 +547,7 @@ M4OSA_ERR M4MCS_intChangeAUVideoTimescale(M4MCS_InternalContext* pC)
     start = pC->ReaderVideoAU.m_dataAddress;
     in = pC->WriterVideoAU.dataAddress;
 
-    M4OSA_memset(in, pC->ReaderVideoAU.m_size , 0);
+    memset((void *)in, 0, pC->ReaderVideoAU.m_size);
     code = M4MCS_GetBitsFromMemory(&parsingCtxt, 8);
     M4MCS_WriteByteToMemory(code, (M4OSA_MemAddr32)in, 0, 8);
     in++;
diff --git a/libvideoeditor/vss/mcs/src/M4MCS_VideoPreProcessing.c b/libvideoeditor/vss/mcs/src/M4MCS_VideoPreProcessing.c
index f9dffdb..de78ded 100755
--- a/libvideoeditor/vss/mcs/src/M4MCS_VideoPreProcessing.c
+++ b/libvideoeditor/vss/mcs/src/M4MCS_VideoPreProcessing.c
@@ -91,15 +91,12 @@ M4OSA_ERR M4MCS_intApplyVPP(M4VPP_Context pContext, M4VIFI_ImagePlane* pPlaneIn,
      is black borders */
     if(pC->MediaRendering == M4MCS_kBlackBorders)
     {
-        M4OSA_memset((M4OSA_MemAddr8)pPlaneOut[0].pac_data,
-            (pPlaneOut[0].u_height*pPlaneOut[0].u_stride),
-            Y_PLANE_BORDER_VALUE);
-        M4OSA_memset((M4OSA_MemAddr8)pPlaneOut[1].pac_data,
-            (pPlaneOut[1].u_height*pPlaneOut[1].u_stride),
-            U_PLANE_BORDER_VALUE);
-        M4OSA_memset((M4OSA_MemAddr8)pPlaneOut[2].pac_data,
-            (pPlaneOut[2].u_height*pPlaneOut[2].u_stride),
-            V_PLANE_BORDER_VALUE);
+        memset((void *)pPlaneOut[0].pac_data,Y_PLANE_BORDER_VALUE,
+            (pPlaneOut[0].u_height*pPlaneOut[0].u_stride));
+        memset((void *)pPlaneOut[1].pac_data,U_PLANE_BORDER_VALUE,
+            (pPlaneOut[1].u_height*pPlaneOut[1].u_stride));
+        memset((void *)pPlaneOut[2].pac_data,V_PLANE_BORDER_VALUE,
+            (pPlaneOut[2].u_height*pPlaneOut[2].u_stride));
     }
     else if ((M4OSA_NULL == pC->ReaderVideoAU.m_dataAddress) ||
              (M4OSA_NULL == pC->pViDecCtxt))
@@ -107,12 +104,12 @@ M4OSA_ERR M4MCS_intApplyVPP(M4VPP_Context pContext, M4VIFI_ImagePlane* pPlaneIn,
         /**
          * We must fill the input of the encoder with a dummy image, because
          * encoding noise leads to a huge video AU, and thus a writer buffer overflow. */
-        M4OSA_memset((M4OSA_MemAddr8)pPlaneOut[0].pac_data,
-             pPlaneOut[0].u_stride * pPlaneOut[0].u_height, 0);
-        M4OSA_memset((M4OSA_MemAddr8)pPlaneOut[1].pac_data,
-             pPlaneOut[1].u_stride * pPlaneOut[1].u_height, 0);
-        M4OSA_memset((M4OSA_MemAddr8)pPlaneOut[2].pac_data,
-             pPlaneOut[2].u_stride * pPlaneOut[2].u_height, 0);
+        memset((void *)pPlaneOut[0].pac_data,0,
+             pPlaneOut[0].u_stride * pPlaneOut[0].u_height);
+        memset((void *)pPlaneOut[1].pac_data,0,
+             pPlaneOut[1].u_stride * pPlaneOut[1].u_height);
+        memset((void *)pPlaneOut[2].pac_data,0,
+             pPlaneOut[2].u_stride * pPlaneOut[2].u_height);
 
         M4OSA_TRACE1_0("M4MCS_intApplyVPP: pReaderVideoAU->m_dataAddress is M4OSA_NULL,\
                        returning M4NO_ERROR");
@@ -231,15 +228,12 @@ M4OSA_ERR M4MCS_intApplyVPP(M4VPP_Context pContext, M4VIFI_ImagePlane* pPlaneIn,
                     pInPlaneU = pImagePlanesTemp[1].pac_data ;
                     pInPlaneV = pImagePlanesTemp[2].pac_data ;
 
-                    M4OSA_memset((M4OSA_MemAddr8)pImagePlanesTemp[0].pac_data,
-                        (pImagePlanesTemp[0].u_height*pImagePlanesTemp[0].u_stride),
-                        Y_PLANE_BORDER_VALUE);
-                    M4OSA_memset((M4OSA_MemAddr8)pImagePlanesTemp[1].pac_data,
-                        (pImagePlanesTemp[1].u_height*pImagePlanesTemp[1].u_stride),
-                        U_PLANE_BORDER_VALUE);
-                    M4OSA_memset((M4OSA_MemAddr8)pImagePlanesTemp[2].pac_data,
-                        (pImagePlanesTemp[2].u_height*pImagePlanesTemp[2].u_stride),
-                        V_PLANE_BORDER_VALUE);
+                    memset((void *)pImagePlanesTemp[0].pac_data,Y_PLANE_BORDER_VALUE,
+                        (pImagePlanesTemp[0].u_height*pImagePlanesTemp[0].u_stride));
+                    memset((void *)pImagePlanesTemp[1].pac_data,U_PLANE_BORDER_VALUE,
+                        (pImagePlanesTemp[1].u_height*pImagePlanesTemp[1].u_stride));
+                    memset((void *)pImagePlanesTemp[2].pac_data,V_PLANE_BORDER_VALUE,
+                        (pImagePlanesTemp[2].u_height*pImagePlanesTemp[2].u_stride));
 
                     if((M4OSA_UInt32)((pC->pPreResizeFrame->u_height * pPlaneOut->u_width)\
                          /pC->pPreResizeFrame->u_width) <= pPlaneOut->u_height)
@@ -389,24 +383,24 @@ M4OSA_ERR M4MCS_intApplyVPP(M4VPP_Context pContext, M4VIFI_ImagePlane* pPlaneIn,
                 {
                     for(i=0; i<pPlaneOut[0].u_height; i++)
                     {
-                        M4OSA_memcpy(   (M4OSA_MemAddr8)pOutPlaneY,
-                                        (M4OSA_MemAddr8)pInPlaneY,
+                        memcpy(   (void *)pOutPlaneY,
+                                        (void *)pInPlaneY,
                                         pPlaneOut[0].u_width);
                         pInPlaneY += pPlaneOut[0].u_width;
                         pOutPlaneY += pPlaneOut[0].u_stride;
                     }
                     for(i=0; i<pPlaneOut[1].u_height; i++)
                     {
-                        M4OSA_memcpy(   (M4OSA_MemAddr8)pOutPlaneU,
-                                        (M4OSA_MemAddr8)pInPlaneU,
+                        memcpy(   (void *)pOutPlaneU,
+                                        (void *)pInPlaneU,
                                         pPlaneOut[1].u_width);
                         pInPlaneU += pPlaneOut[1].u_width;
                         pOutPlaneU += pPlaneOut[1].u_stride;
                     }
                     for(i=0; i<pPlaneOut[2].u_height; i++)
                     {
-                        M4OSA_memcpy(   (M4OSA_MemAddr8)pOutPlaneV,
-                                        (M4OSA_MemAddr8)pInPlaneV,
+                        memcpy(   (void *)pOutPlaneV,
+                                        (void *)pInPlaneV,
                                         pPlaneOut[2].u_width);
                         pInPlaneV += pPlaneOut[2].u_width;
                         pOutPlaneV += pPlaneOut[2].u_stride;
@@ -441,14 +435,14 @@ M4OSA_ERR M4MCS_intApplyVPP(M4VPP_Context pContext, M4VIFI_ImagePlane* pPlaneIn,
     else
     {
         /* Copy last decoded plane to output plane */
-        M4OSA_memcpy((M4OSA_MemAddr8)pPlaneOut[0].pac_data,
-                        (M4OSA_MemAddr8)pC->lastDecodedPlane[0].pac_data,
+        memcpy((void *)pPlaneOut[0].pac_data,
+                        (void *)pC->lastDecodedPlane[0].pac_data,
                          (pPlaneOut[0].u_height * pPlaneOut[0].u_width));
-        M4OSA_memcpy((M4OSA_MemAddr8)pPlaneOut[1].pac_data,
-                        (M4OSA_MemAddr8)pC->lastDecodedPlane[1].pac_data,
+        memcpy((void *)pPlaneOut[1].pac_data,
+                        (void *)pC->lastDecodedPlane[1].pac_data,
                           (pPlaneOut[1].u_height * pPlaneOut[1].u_width));
-        M4OSA_memcpy((M4OSA_MemAddr8)pPlaneOut[2].pac_data,
-                        (M4OSA_MemAddr8)pC->lastDecodedPlane[2].pac_data,
+        memcpy((void *)pPlaneOut[2].pac_data,
+                        (void *)pC->lastDecodedPlane[2].pac_data,
                           (pPlaneOut[2].u_height * pPlaneOut[2].u_width));
         pC->lastDecodedPlane = pPlaneOut;
     }
diff --git a/libvideoeditor/vss/src/M4AD_Null.c b/libvideoeditor/vss/src/M4AD_Null.c
index faac43b..61ef4c0 100755
--- a/libvideoeditor/vss/src/M4AD_Null.c
+++ b/libvideoeditor/vss/src/M4AD_Null.c
@@ -171,11 +171,11 @@ M4OSA_ERR    M4AD_NULL_step(M4AD_Context context, M4AD_Buffer *pInputBuffer,
     }
     else
     {
-        M4OSA_memcpy(pDecodedPCMBuffer->m_dataAddress, pInputBuffer->m_dataAddress,
+        memcpy((void *)pDecodedPCMBuffer->m_dataAddress, (void *)pInputBuffer->m_dataAddress,
                     pInputBuffer->m_bufferSize );
     }
 #else /*M4AD_FORCE_16BITS*/
-    M4OSA_memcpy(pDecodedPCMBuffer->m_dataAddress, pInputBuffer->m_dataAddress,
+    memcpy((void *)pDecodedPCMBuffer->m_dataAddress, (void *)pInputBuffer->m_dataAddress,
                     pInputBuffer->m_bufferSize );
 #endif /*M4AD_FORCE_16BITS*/
 
diff --git a/libvideoeditor/vss/src/M4AIR_API.c b/libvideoeditor/vss/src/M4AIR_API.c
index 6a3546d..a4ac9dd 100755
--- a/libvideoeditor/vss/src/M4AIR_API.c
+++ b/libvideoeditor/vss/src/M4AIR_API.c
@@ -531,7 +531,7 @@ M4OSA_ERR M4AIR_get(M4OSA_Context pContext, M4VIFI_ImagePlane* pIn, M4VIFI_Image
                     for(j=0;j<pOut[i].u_height;j++)
                     {
                         /**< Copy one whole line */
-                        M4OSA_memcpy((M4OSA_MemAddr8)pu8_data_out, (M4OSA_MemAddr8)pu8_data_in,
+                        memcpy((void *)pu8_data_out, (void *)pu8_data_in,
                              pOut[i].u_width);
 
                         /**< Update pointers */
diff --git a/libvideoeditor/vss/src/M4PCMR_CoreReader.c b/libvideoeditor/vss/src/M4PCMR_CoreReader.c
index f21764b..b64b3c7 100755
--- a/libvideoeditor/vss/src/M4PCMR_CoreReader.c
+++ b/libvideoeditor/vss/src/M4PCMR_CoreReader.c
@@ -221,8 +221,8 @@ M4OSA_ERR M4PCMR_getNextStream(M4OSA_Context context, M4SYS_StreamDescription* p
     }
     /* Fill decoderSpecificInfo structure, with decoder config structure filled in 'openread'
          function */
-    M4OSA_memcpy((M4OSA_MemAddr8)pStreamDesc->decoderSpecificInfo,
-         (M4OSA_MemAddr8)&c->m_decoderConfig, sizeof(M4PCMC_DecoderSpecificInfo));
+    memcpy((void *)pStreamDesc->decoderSpecificInfo,
+         (void *)&c->m_decoderConfig, sizeof(M4PCMC_DecoderSpecificInfo));
 
     /* Fill other fields of pStreamDesc structure */
     pStreamDesc->timeScale = 1000;
diff --git a/libvideoeditor/vss/src/M4PTO3GPP_API.c b/libvideoeditor/vss/src/M4PTO3GPP_API.c
index 5581cbd..b45fb64 100755
--- a/libvideoeditor/vss/src/M4PTO3GPP_API.c
+++ b/libvideoeditor/vss/src/M4PTO3GPP_API.c
@@ -424,8 +424,8 @@ M4OSA_ERR M4PTO3GPP_Open(M4PTO3GPP_Context pContext, M4PTO3GPP_Params* pParams)
 
     /**
      * Copy the M4PTO3GPP_Params structure */
-    M4OSA_memcpy((M4OSA_MemAddr8)(&pC->m_Params),
-                (M4OSA_MemAddr8)pParams, sizeof(M4PTO3GPP_Params));
+    memcpy((void *)(&pC->m_Params),
+                (void *)pParams, sizeof(M4PTO3GPP_Params));
     M4OSA_TRACE1_1("M4PTO3GPP_Open: outputVideoBitrate = %d", pC->m_Params.OutputVideoBitrate);
 
     /***********************************/
@@ -857,8 +857,8 @@ M4OSA_ERR M4PTO3GPP_Step(M4PTO3GPP_Context pContext)
                      *  Copy audio data from reader AU to writer AU */
                     M4OSA_TRACE2_1("M4PTO3GPP_Step(): Copying audio AU: size=%d",
                         pC->m_pReaderAudioAU->m_size);
-                    M4OSA_memcpy((M4OSA_MemAddr8)pC->m_WriterAudioAU.dataAddress,
-                        (M4OSA_MemAddr8)pC->m_pReaderAudioAU->m_dataAddress,
+                    memcpy((void *)pC->m_WriterAudioAU.dataAddress,
+                        (void *)pC->m_pReaderAudioAU->m_dataAddress,
                         pC->m_pReaderAudioAU->m_size);
                     pC->m_WriterAudioAU.size = pC->m_pReaderAudioAU->m_size;
 
@@ -1952,8 +1952,8 @@ static M4OSA_ERR M4PTO3GPP_writeAmrSilence122Frame(M4WRITER_DataInterface* pWrit
         return err;
     }
 
-    M4OSA_memcpy((M4OSA_MemAddr8)pWriterAudioAU->dataAddress,
-     (M4OSA_MemAddr8)M4PTO3GPP_AMR_AU_SILENCE_122_FRAME, M4PTO3GPP_AMR_AU_SILENCE_FRAME_122_SIZE);
+    memcpy((void *)pWriterAudioAU->dataAddress,
+     (void *)M4PTO3GPP_AMR_AU_SILENCE_122_FRAME, M4PTO3GPP_AMR_AU_SILENCE_FRAME_122_SIZE);
     pWriterAudioAU->size    = M4PTO3GPP_AMR_AU_SILENCE_FRAME_122_SIZE;
     pWriterAudioAU->CTS     = mtIncCts;
     pWriterAudioAU->nbFrag  = 0;
@@ -2000,8 +2000,8 @@ static M4OSA_ERR M4PTO3GPP_writeAmrSilence048Frame(M4WRITER_DataInterface* pWrit
         return err;
     }
 
-    M4OSA_memcpy((M4OSA_MemAddr8)pWriterAudioAU->dataAddress,
-                (M4OSA_MemAddr8)M4PTO3GPP_AMR_AU_SILENCE_048_FRAME,
+    memcpy((void *)pWriterAudioAU->dataAddress,
+                (void *)M4PTO3GPP_AMR_AU_SILENCE_048_FRAME,
                 M4PTO3GPP_AMR_AU_SILENCE_FRAME_048_SIZE);
     pWriterAudioAU->size    = M4PTO3GPP_AMR_AU_SILENCE_FRAME_048_SIZE;
     pWriterAudioAU->CTS     = mtIncCts;
diff --git a/libvideoeditor/vss/src/M4PTO3GPP_VideoPreProcessing.c b/libvideoeditor/vss/src/M4PTO3GPP_VideoPreProcessing.c
index bcbfaf0..53fb5c9 100755
--- a/libvideoeditor/vss/src/M4PTO3GPP_VideoPreProcessing.c
+++ b/libvideoeditor/vss/src/M4PTO3GPP_VideoPreProcessing.c
@@ -120,8 +120,8 @@ M4OSA_ERR M4PTO3GPP_applyVPP(M4VPP_Context pContext, M4VIFI_ImagePlane* pPlaneIn
          * (the last pic is splited due to the callback extra-call... */
         for (i=0; i<3; i++)
         {
-            M4OSA_memcpy((M4OSA_MemAddr8)pPlaneOut[i].pac_data,
-                 (M4OSA_MemAddr8)pC->pSavedPlane[i].pac_data,
+            memcpy((void *)pPlaneOut[i].pac_data,
+                 (void *)pC->pSavedPlane[i].pac_data,
                      pPlaneOut[i].u_stride * pPlaneOut[i].u_height);
         }
     }
diff --git a/libvideoeditor/vss/src/M4VD_EXTERNAL_BitstreamParser.c b/libvideoeditor/vss/src/M4VD_EXTERNAL_BitstreamParser.c
index 1d8c1cd..bdbf2ba 100755
--- a/libvideoeditor/vss/src/M4VD_EXTERNAL_BitstreamParser.c
+++ b/libvideoeditor/vss/src/M4VD_EXTERNAL_BitstreamParser.c
@@ -42,7 +42,7 @@ M4OSA_UInt32 M4VD_EXTERNAL_GetBitsFromMemory(M4VS_Bitstream_ctxt* parsingCtxt,
     {
         if (parsingCtxt->stream_index == 8)
         {
-            M4OSA_memcpy( (M4OSA_MemAddr8)&(parsingCtxt->stream_byte), parsingCtxt->in,
+            memcpy( (void *)&(parsingCtxt->stream_byte), (void *)parsingCtxt->in,
                  sizeof(unsigned char));
             parsingCtxt->in++;
             //fread(&stream_byte, sizeof(unsigned char),1,in);
diff --git a/libvideoeditor/vss/src/M4VSS3GPP_AudioMixing.c b/libvideoeditor/vss/src/M4VSS3GPP_AudioMixing.c
index 1e05aa3..d948f4d 100644..100755
--- a/libvideoeditor/vss/src/M4VSS3GPP_AudioMixing.c
+++ b/libvideoeditor/vss/src/M4VSS3GPP_AudioMixing.c
@@ -148,8 +148,8 @@ M4OSA_ERR M4VSS3GPP_audioMixingInit( M4VSS3GPP_AudioMixingContext *pContext,
     }
 
     /* Initialization of context Variables */
-    M4OSA_memset((M4OSA_MemAddr8)pC ,
-                 sizeof(M4VSS3GPP_InternalAudioMixingContext),0);
+    memset((void *)pC ,0,
+                 sizeof(M4VSS3GPP_InternalAudioMixingContext));
     /**
     * Copy this setting in context */
     pC->iAddCts = pSettings->uiAddCts;
@@ -1007,7 +1007,7 @@ M4VSS3GPP_intAudioMixingOpen( M4VSS3GPP_InternalAudioMixingContext *pC,
                     return M4ERR_ALLOC;
                 }
                 pC->ewc.uiVideoOutputDsiSize = (M4OSA_UInt16)encHeader->Size;
-                M4OSA_memcpy(pC->ewc.pVideoOutputDsi, encHeader->pBuf,
+                memcpy((void *)pC->ewc.pVideoOutputDsi, (void *)encHeader->pBuf,
                     encHeader->Size);
             }
 
@@ -1939,8 +1939,8 @@ static M4OSA_ERR M4VSS3GPP_intAudioMixingWriteSilence(
 
     M4OSA_TRACE2_0("A #### silence AU");
 
-    M4OSA_memcpy((M4OSA_MemAddr8)pC->ewc.WriterAudioAU.dataAddress,
-        (M4OSA_MemAddr8)pC->ewc.pSilenceFrameData, pC->ewc.uiSilenceFrameSize);
+    memcpy((void *)pC->ewc.WriterAudioAU.dataAddress,
+        (void *)pC->ewc.pSilenceFrameData, pC->ewc.uiSilenceFrameSize);
 
     pC->ewc.WriterAudioAU.size = pC->ewc.uiSilenceFrameSize;
     pC->ewc.WriterAudioAU.CTS =
@@ -2039,8 +2039,8 @@ static M4OSA_ERR M4VSS3GPP_intAudioMixingStepVideo(
 
     /**
     * Copy the input AU payload to the output AU */
-    M4OSA_memcpy((M4OSA_MemAddr8)pC->ewc.WriterVideoAU.dataAddress,
-        (M4OSA_MemAddr8)(pC->pInputClipCtxt->VideoAU.m_dataAddress + offset),
+    memcpy((void *)pC->ewc.WriterVideoAU.dataAddress,
+        (void *)(pC->pInputClipCtxt->VideoAU.m_dataAddress + offset),
         (pC->pInputClipCtxt->VideoAU.m_size));
 
     /**
@@ -2679,8 +2679,8 @@ static M4OSA_ERR M4VSS3GPP_intAudioMixingCopyOrig(
 
     /**
     * Copy the AU itself */
-    M4OSA_memcpy((M4OSA_MemAddr8)pC->ewc.WriterAudioAU.dataAddress,
-        pC->pInputClipCtxt->pAudioFramePtr, pC->ewc.WriterAudioAU.size);
+    memcpy((void *)pC->ewc.WriterAudioAU.dataAddress,
+        (void *)pC->pInputClipCtxt->pAudioFramePtr, pC->ewc.WriterAudioAU.size);
 
     /**
     * Write the mixed AU */
@@ -2860,7 +2860,7 @@ static M4OSA_ERR M4VSS3GPP_intAudioMixingCopyAdded(
         {
             tempPosBuffer = pC->pSsrcBufferOut
                 + pC->pInputClipCtxt->AudioDecBufferOut.m_bufferSize;
-            M4OSA_memmove(pC->pSsrcBufferOut, tempPosBuffer,
+            memmove((void *)pC->pSsrcBufferOut, (void *)tempPosBuffer,
                 pC->pPosInSsrcBufferOut - tempPosBuffer);
             pC->pPosInSsrcBufferOut -=
                 pC->pInputClipCtxt->AudioDecBufferOut.m_bufferSize;
@@ -2868,7 +2868,7 @@ static M4OSA_ERR M4VSS3GPP_intAudioMixingCopyAdded(
         else
         {
             tempPosBuffer = pC->pSsrcBufferIn + pC->minimumBufferIn;
-            M4OSA_memmove(pC->pSsrcBufferIn, tempPosBuffer,
+            memmove((void *)pC->pSsrcBufferIn, (void *)tempPosBuffer,
                 pC->pPosInSsrcBufferIn - tempPosBuffer);
             pC->pPosInSsrcBufferIn -= pC->minimumBufferIn;
         }
@@ -2954,8 +2954,8 @@ static M4OSA_ERR M4VSS3GPP_intAudioMixingCopyAdded(
 
         /**
         * Copy the AU itself */
-        M4OSA_memcpy((M4OSA_MemAddr8)pC->ewc.WriterAudioAU.dataAddress,
-            pC->pAddedClipCtxt->pAudioFramePtr, pC->ewc.WriterAudioAU.size);
+        memcpy((void *)pC->ewc.WriterAudioAU.dataAddress,
+            (void *)pC->pAddedClipCtxt->pAudioFramePtr, pC->ewc.WriterAudioAU.size);
 
         /**
         * Write the mixed AU */
@@ -3116,8 +3116,8 @@ static M4OSA_ERR M4VSS3GPP_intAudioMixingConvert(
         }
 
         /* Copy decoded data into SSRC buffer in */
-        M4OSA_memcpy(pC->pPosInSsrcBufferIn,
-            pC->pAddedClipCtxt->AudioDecBufferOut.m_dataAddress,
+        memcpy((void *)pC->pPosInSsrcBufferIn,
+            (void *)pC->pAddedClipCtxt->AudioDecBufferOut.m_dataAddress,
             pC->pAddedClipCtxt->AudioDecBufferOut.m_bufferSize);
         /* Update position pointer into SSRC buffer In */
 
@@ -3138,8 +3138,8 @@ static M4OSA_ERR M4VSS3GPP_intAudioMixingConvert(
                 /* We use ChannelConversion variable because in case 2, we need twice less data */
             {
                 ssrcErr = 0;
-                M4OSA_memset(pC->pPosInTempBuffer,
-                    (pC->iSsrcNbSamplOut * sizeof(short) * pC->ewc.uiNbChannels),0);
+                memset((void *)pC->pPosInTempBuffer,0,
+                    (pC->iSsrcNbSamplOut * sizeof(short) * pC->ewc.uiNbChannels));
 
                 LVAudioresample_LowQuality((short*)pC->pPosInTempBuffer,
                     (short*)pC->pSsrcBufferIn,
@@ -3162,7 +3162,7 @@ static M4OSA_ERR M4VSS3GPP_intAudioMixingConvert(
                     pC->pSsrcBufferIn + (pC->iSsrcNbSamplIn * sizeof(short)
                     * pC->pAddedClipCtxt->pSettings->
                     ClipProperties.uiNbChannels);
-                M4OSA_memmove(pC->pSsrcBufferIn, tempPosBuffer,
+                memmove((void *)pC->pSsrcBufferIn, (void *)tempPosBuffer,
                     pC->pPosInSsrcBufferIn - tempPosBuffer);
                 pC->pPosInSsrcBufferIn -= pC->iSsrcNbSamplIn * sizeof(short)
                     * pC->pAddedClipCtxt->pSettings->
@@ -3175,8 +3175,8 @@ static M4OSA_ERR M4VSS3GPP_intAudioMixingConvert(
                 < (M4OSA_Int32)pC->pInputClipCtxt->AudioDecBufferOut.m_bufferSize )
             {
                 ssrcErr = 0;
-                M4OSA_memset(pC->pPosInSsrcBufferOut,
-                    (pC->iSsrcNbSamplOut * sizeof(short) * pC->ewc.uiNbChannels),0);
+                memset((void *)pC->pPosInSsrcBufferOut,0,
+                    (pC->iSsrcNbSamplOut * sizeof(short) * pC->ewc.uiNbChannels));
 
                 LVAudioresample_LowQuality((short*)pC->pPosInSsrcBufferOut,
                     (short*)pC->pSsrcBufferIn,
@@ -3197,7 +3197,7 @@ static M4OSA_ERR M4VSS3GPP_intAudioMixingConvert(
                     pC->pSsrcBufferIn + (pC->iSsrcNbSamplIn * sizeof(short)
                     * pC->pAddedClipCtxt->pSettings->
                     ClipProperties.uiNbChannels);
-                M4OSA_memmove(pC->pSsrcBufferIn, tempPosBuffer,
+                memmove((void *)pC->pSsrcBufferIn, (void *)tempPosBuffer,
                     pC->pPosInSsrcBufferIn - tempPosBuffer);
                 pC->pPosInSsrcBufferIn -= pC->iSsrcNbSamplIn * sizeof(short)
                     * pC->pAddedClipCtxt->pSettings->
@@ -3224,7 +3224,7 @@ static M4OSA_ERR M4VSS3GPP_intAudioMixingConvert(
                         * pC->pAddedClipCtxt->pSettings->
                         ClipProperties.
                         uiNbChannels); /* Buffer is in bytes */
-                    M4OSA_memmove(pC->pTempBuffer, tempPosBuffer,
+                    memmove((void *)pC->pTempBuffer, (void *)tempPosBuffer,
                         pC->pPosInTempBuffer - tempPosBuffer);
                     pC->pPosInTempBuffer -=
                         (uiChannelConvertorNbSamples * sizeof(short)
@@ -3246,7 +3246,7 @@ static M4OSA_ERR M4VSS3GPP_intAudioMixingConvert(
                         + (uiChannelConvertorNbSamples * sizeof(short)
                         * pC->pAddedClipCtxt->pSettings->
                         ClipProperties.uiNbChannels);
-                    M4OSA_memmove(pC->pTempBuffer, tempPosBuffer,
+                    memmove((void *)pC->pTempBuffer, (void *)tempPosBuffer,
                         pC->pPosInTempBuffer - tempPosBuffer);
                     pC->pPosInTempBuffer -=
                         (uiChannelConvertorNbSamples * sizeof(short)
@@ -3282,7 +3282,7 @@ static M4OSA_ERR M4VSS3GPP_intAudioMixingConvert(
                         * pC->pAddedClipCtxt->pSettings->
                         ClipProperties.
                         uiNbChannels); /* Buffer is in bytes */
-                    M4OSA_memmove(pC->pSsrcBufferIn, tempPosBuffer,
+                    memmove((void *)pC->pSsrcBufferIn, (void *)tempPosBuffer,
                         pC->pPosInSsrcBufferIn - tempPosBuffer);
                     pC->pPosInSsrcBufferIn -=
                         (uiChannelConvertorNbSamples * sizeof(short)
@@ -3304,7 +3304,7 @@ static M4OSA_ERR M4VSS3GPP_intAudioMixingConvert(
                         + (uiChannelConvertorNbSamples * sizeof(short)
                         * pC->pAddedClipCtxt->pSettings->
                         ClipProperties.uiNbChannels);
-                    M4OSA_memmove(pC->pSsrcBufferIn, tempPosBuffer,
+                    memmove((void *)pC->pSsrcBufferIn, (void *)tempPosBuffer,
                         pC->pPosInSsrcBufferIn - tempPosBuffer);
                     pC->pPosInSsrcBufferIn -=
                         (uiChannelConvertorNbSamples * sizeof(short)
@@ -3653,7 +3653,7 @@ static M4OSA_ERR M4VSS3GPP_intAudioMixingDoMixing(
     {
         tempPosBuffer = pC->pSsrcBufferOut
             + pC->pInputClipCtxt->AudioDecBufferOut.m_bufferSize;
-        M4OSA_memmove(pC->pSsrcBufferOut, tempPosBuffer,
+        memmove((void *)pC->pSsrcBufferOut, (void *)tempPosBuffer,
             pC->pPosInSsrcBufferOut - tempPosBuffer);
         pC->pPosInSsrcBufferOut -=
             pC->pInputClipCtxt->AudioDecBufferOut.m_bufferSize;
@@ -3663,7 +3663,7 @@ static M4OSA_ERR M4VSS3GPP_intAudioMixingDoMixing(
     {
         tempPosBuffer = pC->pSsrcBufferIn
             + pC->pInputClipCtxt->AudioDecBufferOut.m_bufferSize;
-        M4OSA_memmove(pC->pSsrcBufferIn, tempPosBuffer,
+        memmove((void *)pC->pSsrcBufferIn, (void *)tempPosBuffer,
             pC->pPosInSsrcBufferIn - tempPosBuffer);
         pC->pPosInSsrcBufferIn -=
             pC->pInputClipCtxt->AudioDecBufferOut.m_bufferSize;
diff --git a/libvideoeditor/vss/src/M4VSS3GPP_Clip.c b/libvideoeditor/vss/src/M4VSS3GPP_Clip.c
index 8b9fabe..46c0eb1 100755
--- a/libvideoeditor/vss/src/M4VSS3GPP_Clip.c
+++ b/libvideoeditor/vss/src/M4VSS3GPP_Clip.c
@@ -111,7 +111,7 @@ M4OSA_ERR M4VSS3GPP_intClipInit( M4VSS3GPP_ClipContext ** hClipCtxt,
     pClipCtxt = *hClipCtxt;
 
     /* Inialization of context Variables */
-    M4OSA_memset((M4OSA_MemAddr8)pClipCtxt, sizeof(M4VSS3GPP_ClipContext), 0);
+    memset((void *)pClipCtxt, 0,sizeof(M4VSS3GPP_ClipContext));
 
     pClipCtxt->pSettings = M4OSA_NULL;
 
@@ -1390,16 +1390,16 @@ M4OSA_ERR M4VSS3GPP_intClipDecodeCurrentAudioFrame(
         }
 
         /* Fill it with 0 (= pcm silence) */
-        M4OSA_memset(pClipCtxt->AudioDecBufferOut.m_dataAddress,
-             pClipCtxt->AudioDecBufferOut.m_bufferSize * sizeof(M4OSA_Int16), 0);
+        memset(pClipCtxt->AudioDecBufferOut.m_dataAddress,0,
+             pClipCtxt->AudioDecBufferOut.m_bufferSize * sizeof(M4OSA_Int16));
     }
     else if (pClipCtxt->pSettings->FileType == M4VIDEOEDITING_kFileType_PCM)
     {
         pClipCtxt->AudioDecBufferIn.m_dataAddress = (M4OSA_MemAddr8) pClipCtxt->pAudioFramePtr;
         pClipCtxt->AudioDecBufferIn.m_bufferSize  = pClipCtxt->uiAudioFrameSize;
 
-        M4OSA_memcpy(pClipCtxt->AudioDecBufferOut.m_dataAddress,
-            pClipCtxt->AudioDecBufferIn.m_dataAddress, pClipCtxt->AudioDecBufferIn.m_bufferSize);
+        memcpy((void *)pClipCtxt->AudioDecBufferOut.m_dataAddress,
+            (void *)pClipCtxt->AudioDecBufferIn.m_dataAddress, pClipCtxt->AudioDecBufferIn.m_bufferSize);
         pClipCtxt->AudioDecBufferOut.m_bufferSize = pClipCtxt->AudioDecBufferIn.m_bufferSize;
         /**
         * Return with no error */
diff --git a/libvideoeditor/vss/src/M4VSS3GPP_ClipAnalysis.c b/libvideoeditor/vss/src/M4VSS3GPP_ClipAnalysis.c
index 97e3e89..3de1322 100755
--- a/libvideoeditor/vss/src/M4VSS3GPP_ClipAnalysis.c
+++ b/libvideoeditor/vss/src/M4VSS3GPP_ClipAnalysis.c
@@ -487,8 +487,8 @@ M4OSA_ERR M4VSS3GPP_intBuildAnalysis( M4VSS3GPP_ClipContext *pClipCtxt,
     pClipProperties->bMPEG4rvlc = M4OSA_FALSE;
     pClipProperties->bMPEG4resynchMarker = M4OSA_FALSE;
 
-    M4OSA_memset((M4OSA_MemAddr8) &pClipProperties->ftyp,
-        sizeof(pClipProperties->ftyp), 0);
+    memset((void *) &pClipProperties->ftyp,0,
+        sizeof(pClipProperties->ftyp));
 
     /**
     * Video Analysis */
diff --git a/libvideoeditor/vss/src/M4VSS3GPP_Edit.c b/libvideoeditor/vss/src/M4VSS3GPP_Edit.c
index 8ae0f15..7f44a6b 100755
--- a/libvideoeditor/vss/src/M4VSS3GPP_Edit.c
+++ b/libvideoeditor/vss/src/M4VSS3GPP_Edit.c
@@ -137,7 +137,7 @@ M4OSA_ERR M4VSS3GPP_editInit( M4VSS3GPP_EditContext *pContext,
         M4VSS3GPP, (M4OSA_Char *)"M4VSS3GPP_InternalContext");
     *pContext = pC;
         /* Inialization of context Variables */
-    M4OSA_memset((M4OSA_MemAddr8)pC, sizeof(M4VSS3GPP_InternalEditContext), 0);
+    memset((void *)pC, 0,sizeof(M4VSS3GPP_InternalEditContext));
 
     if( M4OSA_NULL == pC )
     {
@@ -278,7 +278,7 @@ M4VSS3GPP_editCreateClipSettings( M4VSS3GPP_ClipSettings *pClipSettings,
 
     if( M4OSA_NULL != pFile )
     {
-        //pClipSettings->pFile = (M4OSA_Char*) M4OSA_malloc(M4OSA_chrLength(pFile)+1, M4VSS3GPP,
+        //pClipSettings->pFile = (M4OSA_Char*) M4OSA_malloc(strlen(pFile)+1, M4VSS3GPP,
         // "pClipSettings->pFile");
         /*FB: add clip path size because of utf 16 conversion*/
         pClipSettings->pFile =
@@ -291,9 +291,9 @@ M4VSS3GPP_editCreateClipSettings( M4VSS3GPP_ClipSettings *pClipSettings,
                 "M4VSS3GPP_editCreateClipSettings : ERROR allocating filename");
             return M4ERR_ALLOC;
         }
-        //M4OSA_memcpy(pClipSettings->pFile, pFile, M4OSA_chrLength(pFile)+1);
+        //memcpy(pClipSettings->pFile, pFile, strlen(pFile)+1);
         /*FB: add clip path size because of utf 16 conversion*/
-        M4OSA_memcpy(pClipSettings->pFile, pFile, filePathSize + 1);
+        memcpy((void *)pClipSettings->pFile, (void *)pFile, filePathSize + 1);
     }
 
     /*FB: add file path size to support UTF16 conversion*/
@@ -375,14 +375,14 @@ M4VSS3GPP_editDuplicateClipSettings( M4VSS3GPP_ClipSettings *pClipSettingsDest,
         "M4VSS3GPP_editDuplicateClipSettings: pClipSettingsOrig is NULL");
 
     /* Copy plain structure */
-    M4OSA_memcpy((M4OSA_MemAddr8)pClipSettingsDest,
-        (M4OSA_MemAddr8)pClipSettingsOrig, sizeof(M4VSS3GPP_ClipSettings));
+    memcpy((void *)pClipSettingsDest,
+        (void *)pClipSettingsOrig, sizeof(M4VSS3GPP_ClipSettings));
 
     /* Duplicate filename */
     if( M4OSA_NULL != pClipSettingsOrig->pFile )
     {
         //pClipSettingsDest->pFile =
-        // (M4OSA_Char*) M4OSA_malloc(M4OSA_chrLength(pClipSettingsOrig->pFile)+1, M4VSS3GPP,
+        // (M4OSA_Char*) M4OSA_malloc(strlen(pClipSettingsOrig->pFile)+1, M4VSS3GPP,
         // "pClipSettingsDest->pFile");
         /*FB: clip path size is needed for utf 16 conversion*/
         /*FB 2008/10/16: bad allocation size which raises a crash*/
@@ -397,10 +397,10 @@ M4VSS3GPP_editDuplicateClipSettings( M4VSS3GPP_ClipSettings *pClipSettingsDest,
             return M4ERR_ALLOC;
         }
         /*FB: clip path size is needed for utf 16 conversion*/
-        //M4OSA_memcpy(pClipSettingsDest->pFile, pClipSettingsOrig->pFile,
-        // M4OSA_chrLength(pClipSettingsOrig->pFile)+1);
+        //memcpy(pClipSettingsDest->pFile, pClipSettingsOrig->pFile,
+        // strlen(pClipSettingsOrig->pFile)+1);
         /*FB 2008/10/16: bad allocation size which raises a crash*/
-        M4OSA_memcpy(pClipSettingsDest->pFile, pClipSettingsOrig->pFile,
+        memcpy((void *)pClipSettingsDest->pFile, (void *)pClipSettingsOrig->pFile,
             pClipSettingsOrig->filePathSize/*+1*/);
         ( (M4OSA_Char
             *)pClipSettingsDest->pFile)[pClipSettingsOrig->filePathSize] = '\0';
@@ -430,9 +430,9 @@ M4VSS3GPP_editDuplicateClipSettings( M4VSS3GPP_ClipSettings *pClipSettingsDest,
             for ( uiFx = 0; uiFx < pClipSettingsOrig->nbEffects; uiFx++ )
             {
                 /* Copy plain structure */
-                M4OSA_memcpy(
-                    (M4OSA_MemAddr8) &(pClipSettingsDest->Effects[uiFx]),
-                    (M4OSA_MemAddr8) &(pClipSettingsOrig->Effects[uiFx]),
+                memcpy(
+                    (void *) &(pClipSettingsDest->Effects[uiFx]),
+                    (void *) &(pClipSettingsOrig->Effects[uiFx]),
                     sizeof(M4VSS3GPP_EffectSettings));
             }
         }
@@ -588,8 +588,8 @@ M4OSA_ERR M4VSS3GPP_editOpen( M4VSS3GPP_EditContext pContext,
 
         for ( i = 0; i < pC->nbEffects; i++ )
         {
-            M4OSA_memcpy((M4OSA_MemAddr8) &(pC->pEffectsList[i]),
-                (M4OSA_MemAddr8) &(pSettings->Effects[i]),
+            memcpy((void *) &(pC->pEffectsList[i]),
+                (void *) &(pSettings->Effects[i]),
                 sizeof(M4VSS3GPP_EffectSettings));
         }
 
@@ -731,8 +731,8 @@ M4OSA_ERR M4VSS3GPP_editOpen( M4VSS3GPP_EditContext pContext,
     /**< copy transition settings */
     for ( i = 0; i < (pSettings->uiClipNumber - 1); i++ )
     {
-        M4OSA_memcpy((M4OSA_MemAddr8) &(pC->pTransitionList[i]),
-            (M4OSA_MemAddr8)pSettings->pTransitionList[i],
+        memcpy((void *) &(pC->pTransitionList[i]),
+            (void *)pSettings->pTransitionList[i],
             sizeof(M4VSS3GPP_TransitionSettings));
     }
 
@@ -2948,8 +2948,8 @@ M4VSS3GPP_intComputeOutputVideoAndAudioDsi( M4VSS3GPP_InternalEditContext *pC,
         }
         pC->ewc.uiVideoOutputDsiSize =
             (M4OSA_UInt16)pStreamForDsi->m_decoderSpecificInfoSize;
-        M4OSA_memcpy(pC->ewc.pVideoOutputDsi,
-            (M4OSA_MemAddr8)pStreamForDsi->m_pDecoderSpecificInfo,
+        memcpy((void *)pC->ewc.pVideoOutputDsi,
+            (void *)pStreamForDsi->m_pDecoderSpecificInfo,
             pC->ewc.uiVideoOutputDsiSize);
 
         /**
@@ -3034,7 +3034,7 @@ M4VSS3GPP_intComputeOutputVideoAndAudioDsi( M4VSS3GPP_InternalEditContext *pC,
                     return M4ERR_ALLOC;
                 }
                 pC->ewc.uiVideoOutputDsiSize = (M4OSA_UInt16)encHeader->Size;
-                M4OSA_memcpy(pC->ewc.pVideoOutputDsi, encHeader->pBuf,
+                memcpy((void *)pC->ewc.pVideoOutputDsi, (void *)encHeader->pBuf,
                     encHeader->Size);
             }
 
@@ -3118,8 +3118,8 @@ M4VSS3GPP_intComputeOutputVideoAndAudioDsi( M4VSS3GPP_InternalEditContext *pC,
         }
         pC->ewc.uiAudioOutputDsiSize =
             (M4OSA_UInt16)pStreamForDsi->m_decoderSpecificInfoSize;
-        M4OSA_memcpy(pC->ewc.pAudioOutputDsi,
-            (M4OSA_MemAddr8)pStreamForDsi->m_pDecoderSpecificInfo,
+        memcpy((void *)pC->ewc.pAudioOutputDsi,
+            (void *)pStreamForDsi->m_pDecoderSpecificInfo,
             pC->ewc.uiAudioOutputDsiSize);
 
         /**
diff --git a/libvideoeditor/vss/src/M4VSS3GPP_EditAudio.c b/libvideoeditor/vss/src/M4VSS3GPP_EditAudio.c
index b118244..1e2eb99 100755
--- a/libvideoeditor/vss/src/M4VSS3GPP_EditAudio.c
+++ b/libvideoeditor/vss/src/M4VSS3GPP_EditAudio.c
@@ -322,8 +322,8 @@ M4OSA_ERR M4VSS3GPP_intEditStepAudio( M4VSS3GPP_InternalEditContext *pC )
                     /**
                     * Copy a silence AU to the output */
                     pC->ewc.WriterAudioAU.size = pC->ewc.uiSilenceFrameSize;
-                    M4OSA_memcpy((M4OSA_MemAddr8)pC->ewc.WriterAudioAU.dataAddress,
-                        (M4OSA_MemAddr8)pC->ewc.pSilenceFrameData, pC->ewc.uiSilenceFrameSize);
+                    memcpy((void *)pC->ewc.WriterAudioAU.dataAddress,
+                        (void *)pC->ewc.pSilenceFrameData, pC->ewc.uiSilenceFrameSize);
                     M4OSA_TRACE2_0("A #### silence AU");
                 }
                 else if( (M4OSA_UInt32)pC->pC1->uiAudioFrameSize
@@ -333,8 +333,8 @@ M4OSA_ERR M4VSS3GPP_intEditStepAudio( M4VSS3GPP_InternalEditContext *pC )
                     * Copy the input AU to the output AU */
                     pC->ewc.WriterAudioAU.size =
                         (M4OSA_UInt32)pC->pC1->uiAudioFrameSize;
-                    M4OSA_memcpy((M4OSA_MemAddr8)pC->ewc.WriterAudioAU.dataAddress,
-                        pC->pC1->pAudioFramePtr, pC->ewc.WriterAudioAU.size);
+                    memcpy((void *)pC->ewc.WriterAudioAU.dataAddress,
+                        (void *)pC->pC1->pAudioFramePtr, pC->ewc.WriterAudioAU.size);
                 }
                 else
                 {
@@ -650,8 +650,8 @@ M4OSA_ERR M4VSS3GPP_intEditStepAudio( M4VSS3GPP_InternalEditContext *pC )
                     /**
                     * Copy a silence AMR AU to the output */
                     pC->ewc.WriterAudioAU.size = pC->ewc.uiSilenceFrameSize;
-                    M4OSA_memcpy((M4OSA_MemAddr8)pC->ewc.WriterAudioAU.dataAddress,
-                        (M4OSA_MemAddr8)pC->ewc.pSilenceFrameData, pC->ewc.uiSilenceFrameSize);
+                    memcpy((void *)pC->ewc.WriterAudioAU.dataAddress,
+                        (void *)pC->ewc.pSilenceFrameData, pC->ewc.uiSilenceFrameSize);
                     M4OSA_TRACE2_0("G #### silence AU");
                 }
                 else
@@ -1786,8 +1786,8 @@ static M4OSA_ERR M4VSS3GPP_intAudioTransition( M4VSS3GPP_InternalEditContext
             {
                 /**
                 * Copy the input PCM to the output buffer */
-                M4OSA_memcpy((M4OSA_MemAddr8)pPCMdata1,
-                    (M4OSA_MemAddr8)pPCMdata2, uiPCMsize);
+                memcpy((void *)pPCMdata1,
+                    (void *)pPCMdata2, uiPCMsize);
             }
             /**
             * the output must be put in the first buffer.
diff --git a/libvideoeditor/vss/src/M4VSS3GPP_EditVideo.c b/libvideoeditor/vss/src/M4VSS3GPP_EditVideo.c
index fdc919a..9161a9a 100755
--- a/libvideoeditor/vss/src/M4VSS3GPP_EditVideo.c
+++ b/libvideoeditor/vss/src/M4VSS3GPP_EditVideo.c
@@ -269,8 +269,8 @@ M4OSA_ERR M4VSS3GPP_intEditStepVideo( M4VSS3GPP_InternalEditContext *pC )
                         return M4VSS3GPP_ERR_INPUT_VIDEO_AU_TOO_LARGE;
                     }
 
-                    M4OSA_memcpy((M4OSA_MemAddr8)pC->ewc.WriterVideoAU.dataAddress,
-                        (pC->pC1->VideoAU.m_dataAddress + offset),
+                    memcpy((void *)pC->ewc.WriterVideoAU.dataAddress,
+                        (void *)(pC->pC1->VideoAU.m_dataAddress + offset),
                         (pC->ewc.WriterVideoAU.size));
 
                     /**
@@ -999,12 +999,12 @@ M4OSA_ERR M4VSS3GPP_intVPP( M4VPP_Context pContext, M4VIFI_ImagePlane *pPlaneIn,
         /**
         * We must fill the input of the encoder with a dummy image, because
         * encoding noise leads to a huge video AU, and thus a writer buffer overflow. */
-        M4OSA_memset((M4OSA_MemAddr8)pPlaneOut[0].pac_data,
-            pPlaneOut[0].u_stride * pPlaneOut[0].u_height, 0);
-        M4OSA_memset((M4OSA_MemAddr8)pPlaneOut[1].pac_data,
-            pPlaneOut[1].u_stride * pPlaneOut[1].u_height, 0);
-        M4OSA_memset((M4OSA_MemAddr8)pPlaneOut[2].pac_data,
-            pPlaneOut[2].u_stride * pPlaneOut[2].u_height, 0);
+        memset((void *)pPlaneOut[0].pac_data,0,
+            pPlaneOut[0].u_stride * pPlaneOut[0].u_height);
+        memset((void *)pPlaneOut[1].pac_data,0,
+            pPlaneOut[1].u_stride * pPlaneOut[1].u_height);
+        memset((void *)pPlaneOut[2].pac_data,0,
+            pPlaneOut[2].u_stride * pPlaneOut[2].u_height);
 
         M4OSA_TRACE3_0("M4VSS3GPP_intVPP: returning M4NO_ERROR (abort)");
         return M4NO_ERROR;
@@ -1152,14 +1152,14 @@ M4OSA_ERR M4VSS3GPP_intVPP( M4VPP_Context pContext, M4VIFI_ImagePlane *pPlaneIn,
         else
         {
             /* Copy last decoded plane to output plane */
-            M4OSA_memcpy((M4OSA_MemAddr8)pTmp[0].pac_data,
-                (M4OSA_MemAddr8)pC->pC1->lastDecodedPlane[0].pac_data,
+            memcpy((void *)pTmp[0].pac_data,
+                (void *)pC->pC1->lastDecodedPlane[0].pac_data,
                 (pTmp[0].u_height * pTmp[0].u_width));
-            M4OSA_memcpy((M4OSA_MemAddr8)pTmp[1].pac_data,
-                (M4OSA_MemAddr8)pC->pC1->lastDecodedPlane[1].pac_data,
+            memcpy((void *)pTmp[1].pac_data,
+                (void *)pC->pC1->lastDecodedPlane[1].pac_data,
                 (pTmp[1].u_height * pTmp[1].u_width));
-            M4OSA_memcpy((M4OSA_MemAddr8)pTmp[2].pac_data,
-                (M4OSA_MemAddr8)pC->pC1->lastDecodedPlane[2].pac_data,
+            memcpy((void *)pTmp[2].pac_data,
+                (void *)pC->pC1->lastDecodedPlane[2].pac_data,
                 (pTmp[2].u_height * pTmp[2].u_width));
             pC->pC1->lastDecodedPlane = pTmp;
         }
@@ -1218,14 +1218,14 @@ M4OSA_ERR M4VSS3GPP_intVPP( M4VPP_Context pContext, M4VIFI_ImagePlane *pPlaneIn,
         else
         {
             /* Copy last decoded plane to output plane */
-            M4OSA_memcpy((M4OSA_MemAddr8)pTmp[0].pac_data,
-                (M4OSA_MemAddr8)pC->pC2->lastDecodedPlane[0].pac_data,
+            memcpy((void *)pTmp[0].pac_data,
+                (void *)pC->pC2->lastDecodedPlane[0].pac_data,
                 (pTmp[0].u_height * pTmp[0].u_width));
-            M4OSA_memcpy((M4OSA_MemAddr8)pTmp[1].pac_data,
-                (M4OSA_MemAddr8)pC->pC2->lastDecodedPlane[1].pac_data,
+            memcpy((void *)pTmp[1].pac_data,
+                (void *)pC->pC2->lastDecodedPlane[1].pac_data,
                 (pTmp[1].u_height * pTmp[1].u_width));
-            M4OSA_memcpy((M4OSA_MemAddr8)pTmp[2].pac_data,
-                (M4OSA_MemAddr8)pC->pC2->lastDecodedPlane[2].pac_data,
+            memcpy((void *)pTmp[2].pac_data,
+                (void *)pC->pC2->lastDecodedPlane[2].pac_data,
                 (pTmp[2].u_height * pTmp[2].u_width));
             pC->pC2->lastDecodedPlane = pTmp;
         }
@@ -1326,14 +1326,14 @@ M4OSA_ERR M4VSS3GPP_intVPP( M4VPP_Context pContext, M4VIFI_ImagePlane *pPlaneIn,
         else
         {
             /* Copy last decoded plane to output plane */
-            M4OSA_memcpy((M4OSA_MemAddr8)pTmp[0].pac_data,
-                (M4OSA_MemAddr8)pC->pC1->lastDecodedPlane[0].pac_data,
+            memcpy((void *)pTmp[0].pac_data,
+                (void *)pC->pC1->lastDecodedPlane[0].pac_data,
                 (pTmp[0].u_height * pTmp[0].u_width));
-            M4OSA_memcpy((M4OSA_MemAddr8)pTmp[1].pac_data,
-                (M4OSA_MemAddr8)pC->pC1->lastDecodedPlane[1].pac_data,
+            memcpy((void *)pTmp[1].pac_data,
+                (void *)pC->pC1->lastDecodedPlane[1].pac_data,
                 (pTmp[1].u_height * pTmp[1].u_width));
-            M4OSA_memcpy((M4OSA_MemAddr8)pTmp[2].pac_data,
-                (M4OSA_MemAddr8)pC->pC1->lastDecodedPlane[2].pac_data,
+            memcpy((void *)pTmp[2].pac_data,
+                (void *)pC->pC1->lastDecodedPlane[2].pac_data,
                 (pTmp[2].u_height * pTmp[2].u_width));
             pC->pC1->lastDecodedPlane = pTmp;
         }
@@ -1780,8 +1780,8 @@ M4VSS3GPP_intVideoTransition( M4VSS3GPP_InternalEditContext *pC,
 
             while( i-- > 0 )
             {
-                M4OSA_memcpy((M4OSA_MemAddr8)pPlaneOut[i].pac_data,
-                 (M4OSA_MemAddr8)pPlane[i].pac_data,
+                memcpy((void *)pPlaneOut[i].pac_data,
+                 (void *)pPlane[i].pac_data,
                     pPlaneOut[i].u_stride * pPlaneOut[i].u_height);
             }
             break;
diff --git a/libvideoeditor/vss/src/M4xVSS_API.c b/libvideoeditor/vss/src/M4xVSS_API.c
index 593c5b7..d211a34 100755
--- a/libvideoeditor/vss/src/M4xVSS_API.c
+++ b/libvideoeditor/vss/src/M4xVSS_API.c
@@ -159,7 +159,7 @@ M4OSA_ERR M4xVSS_Init( M4OSA_Context *pContext, M4xVSS_InitParams *pParams )
             M4OSA_TRACE1_0("Allocation error in M4xVSS_Init");
             return M4ERR_ALLOC;
         }
-        M4OSA_memcpy(xVSS_context->pTempPath, pParams->pTempPath,
+        memcpy((void *)xVSS_context->pTempPath, (void *)pParams->pTempPath,
             strlen(pParams->pTempPath) + 1);
         /* TODO: Check that no previous xVSS temporary files are present ? */
     }
@@ -873,8 +873,8 @@ M4OSA_ERR M4xVSS_SendCommand( M4OSA_Context pContext,
             /**/
             return M4ERR_ALLOC;
         }
-        M4OSA_memcpy((M4OSA_MemAddr8)xVSS_context->pSettings->pOutputFile,
-            (M4OSA_MemAddr8)pDecodedPath, pSettings->uiOutputPathSize + 1);
+        memcpy((void *)xVSS_context->pSettings->pOutputFile,
+            (void *)pDecodedPath, pSettings->uiOutputPathSize + 1);
         xVSS_context->pSettings->uiOutputPathSize = pSettings->uiOutputPathSize;
         xVSS_context->pOutputFile = xVSS_context->pSettings->pOutputFile;
     }
@@ -1082,9 +1082,9 @@ M4OSA_ERR M4xVSS_SendCommand( M4OSA_Context pContext,
             return M4ERR_ALLOC;
         }
         /* Set clip list to NULL */
-        M4OSA_memset((M4OSA_MemAddr8)xVSS_context->pSettings->pClipList,
+        memset((void *)xVSS_context->pSettings->pClipList,0,
             sizeof(M4VSS3GPP_ClipSettings *)
-            *xVSS_context->pSettings->uiClipNumber, 0);
+            *xVSS_context->pSettings->uiClipNumber);
 
         if( xVSS_context->pSettings->uiClipNumber > 1 )
         {
@@ -1104,10 +1104,10 @@ M4OSA_ERR M4xVSS_SendCommand( M4OSA_Context pContext,
                 return M4ERR_ALLOC;
             }
             /* Set transition list to NULL */
-            M4OSA_memset(
-                (M4OSA_MemAddr8)xVSS_context->pSettings->pTransitionList,
+            memset(
+                (void *)xVSS_context->pSettings->pTransitionList,0,
                 sizeof(M4VSS3GPP_TransitionSettings *)
-                *(xVSS_context->pSettings->uiClipNumber - 1), 0);
+                *(xVSS_context->pSettings->uiClipNumber - 1));
         }
         else
         {
@@ -1232,9 +1232,9 @@ M4OSA_ERR M4xVSS_SendCommand( M4OSA_Context pContext,
                 return M4ERR_ALLOC;
             }
 
-            M4OSA_memcpy(
-                (M4OSA_MemAddr8)xVSS_context->pSettings->pTransitionList[i],
-                (M4OSA_MemAddr8)pSettings->pTransitionList[i],
+            memcpy(
+                (void *)xVSS_context->pSettings->pTransitionList[i],
+                (void *)pSettings->pTransitionList[i],
                 sizeof(M4VSS3GPP_TransitionSettings));
             /* Initialize external effect context to NULL, to know if input jpg has already been
             decoded or not */
@@ -1267,10 +1267,10 @@ M4OSA_ERR M4xVSS_SendCommand( M4OSA_Context pContext,
                     }
                     /* Copy data from the provided alpha magic settings structure tou our
                     structure */
-                    M4OSA_memcpy((M4OSA_MemAddr8)xVSS_context->pSettings->
+                    memcpy((void *)xVSS_context->pSettings->
                         pTransitionList[i]-> \
                         xVSS.transitionSpecific.pAlphaMagicSettings,
-                        (M4OSA_MemAddr8)pSettings->pTransitionList[i]-> \
+                        (void *)pSettings->pTransitionList[i]-> \
                         xVSS.transitionSpecific.pAlphaMagicSettings,
                         sizeof(M4xVSS_AlphaMagicSettings));
 
@@ -1841,7 +1841,7 @@ M4OSA_ERR M4xVSS_SendCommand( M4OSA_Context pContext,
                 /**/
                 return M4ERR_ALLOC;
             }
-            M4OSA_memcpy(pParams->pFileIn, pDecodedPath,
+            memcpy((void *)pParams->pFileIn, (void *)pDecodedPath,
                 (length + 1)); /* Copy input file path */
 
             /* Check that JPG file is present on the FS (P4ME00002974) by just opening and
@@ -1910,7 +1910,7 @@ M4OSA_ERR M4xVSS_SendCommand( M4OSA_Context pContext,
                 /**/
                 return M4ERR_ALLOC;
             }
-            M4OSA_memcpy(pParams->pFileOut, pDecodedPath,
+            memcpy((void *)pParams->pFileOut, (void *)pDecodedPath,
                 (length + 1)); /* Copy output file path */
 
 #ifdef M4xVSS_RESERVED_MOOV_DISK_SPACE
@@ -1956,7 +1956,7 @@ M4OSA_ERR M4xVSS_SendCommand( M4OSA_Context pContext,
                 /**/
                 return M4ERR_ALLOC;
             }
-            M4OSA_memcpy(pParams->pFileTemp, pDecodedPath,
+            memcpy((void *)pParams->pFileTemp, (void *)pDecodedPath,
                 (length + 1)); /* Copy temporary file path */
 
 #endif                         /*M4xVSS_RESERVED_MOOV_DISK_SPACE*/
@@ -2134,8 +2134,8 @@ replaceJPG_3GP:
                 /**/
                 return M4ERR_ALLOC;
             }
-            M4OSA_memcpy(xVSS_context->pSettings->pClipList[i]->pFile,
-                pDecodedPath, (length + 1));
+            memcpy((void *)xVSS_context->pSettings->pClipList[i]->pFile,
+                (void *)pDecodedPath, (length + 1));
             /*FB: add file path size because of UTF16 conversion*/
             xVSS_context->pSettings->pClipList[i]->filePathSize = length+1;
         }
@@ -2325,7 +2325,7 @@ replaceJPG_3GP:
                         /**/
                         return M4ERR_ALLOC;
                     }
-                    M4OSA_memcpy(pParams->pFileIn, pDecodedPath,
+                    memcpy((void *)pParams->pFileIn, (void *)pDecodedPath,
                         (length + 1)); /* Copy input file path */
 
                     /* Check that JPG file is present on the FS (P4ME00002974) by just opening
@@ -2394,7 +2394,7 @@ replaceJPG_3GP:
                         /**/
                         return M4ERR_ALLOC;
                     }
-                    M4OSA_memcpy(pParams->pFileOut, pDecodedPath,
+                    memcpy((void *)pParams->pFileOut, (void *)pDecodedPath,
                         (length + 1)); /* Copy output file path */
 
 #ifdef M4xVSS_RESERVED_MOOV_DISK_SPACE
@@ -2440,7 +2440,7 @@ replaceJPG_3GP:
                         /**/
                         return M4ERR_ALLOC;
                     }
-                    M4OSA_memcpy(pParams->pFileTemp, pDecodedPath,
+                    memcpy((void *)pParams->pFileTemp, (void *)pDecodedPath,
                         (length + 1)); /* Copy temporary file path */
 
 #endif                         /*M4xVSS_RESERVED_MOOV_DISK_SPACE*/
@@ -2610,8 +2610,8 @@ replaceARGB_3GP:
                         /**/
                         return M4ERR_ALLOC;
                     }
-                    M4OSA_memcpy(xVSS_context->pSettings->pClipList[i]->pFile,
-                        pDecodedPath, (length + 1));
+                    memcpy((void *)xVSS_context->pSettings->pClipList[i]->pFile,
+                        (void *)pDecodedPath, (length + 1));
                     /*FB: add file path size because of UTF16 conversion*/
                     xVSS_context->pSettings->pClipList[i]->filePathSize = length+1;
         }
@@ -2646,8 +2646,8 @@ replaceARGB_3GP:
 
             /* Initialize file properties structure */
 
-            M4OSA_memset((M4OSA_MemAddr8) &fileProperties,
-                sizeof(M4VIDEOEDITING_ClipProperties), 0);
+            memset((void *) &fileProperties,0,
+                sizeof(M4VIDEOEDITING_ClipProperties));
 
             //fileProperties.AudioStreamType = M4VIDEOEDITING_kNoneAudio;
 
@@ -3295,7 +3295,7 @@ replaceARGB_3GP:
                     /**/
                     return M4ERR_ALLOC;
                 }
-                M4OSA_memcpy(pParams->pFileIn, pDecodedPath,
+                memcpy((void *)pParams->pFileIn, (void *)pDecodedPath,
                     (length + 1)); /* Copy input file path */
 
                 /**
@@ -3341,7 +3341,7 @@ replaceARGB_3GP:
                     /**/
                     return M4ERR_ALLOC;
                 }
-                M4OSA_memcpy(pParams->pFileOut, pDecodedPath,
+                memcpy((void *)pParams->pFileOut, (void *)pDecodedPath,
                     (length + 1)); /* Copy output file path */
 
 #ifdef M4xVSS_RESERVED_MOOV_DISK_SPACE
@@ -3390,7 +3390,7 @@ replaceARGB_3GP:
                     /**/
                     return M4ERR_ALLOC;
                 }
-                M4OSA_memcpy(pParams->pFileTemp, pDecodedPath,
+                memcpy((void *)pParams->pFileTemp, (void *)pDecodedPath,
                     (length + 1)); /* Copy temporary file path */
 
 #else
@@ -3492,8 +3492,8 @@ replace3GP_3GP:
                     /**/
                     return M4ERR_ALLOC;
                 }
-                M4OSA_memcpy(xVSS_context->pSettings->pClipList[i]->pFile,
-                    pDecodedPath, (length + 1));
+                memcpy((void *)xVSS_context->pSettings->pClipList[i]->pFile,
+                    (void *)pDecodedPath, (length + 1));
                 /*FB: add file path size because of UTF 16 conversion*/
                 xVSS_context->pSettings->pClipList[i]->filePathSize = length+1;
 
@@ -3550,8 +3550,8 @@ replace3GP_3GP:
     for ( j = 0; j < xVSS_context->pSettings->nbEffects; j++ )
     {
         /* Copy effect to "local" structure */
-        M4OSA_memcpy((M4OSA_MemAddr8) &(xVSS_context->pSettings->Effects[j]),
-            (M4OSA_MemAddr8) &(pSettings->Effects[j]),
+        memcpy((void *) &(xVSS_context->pSettings->Effects[j]),
+            (void *) &(pSettings->Effects[j]),
             sizeof(M4VSS3GPP_EffectSettings));
 
         /* Prevent from bad initializing of effect percentage time */
@@ -3618,9 +3618,9 @@ replace3GP_3GP:
                     /**/
                     return M4ERR_ALLOC;
                 }
-                M4OSA_memcpy((M4OSA_MemAddr8)xVSS_context->pSettings->
+                memcpy((void *)xVSS_context->pSettings->
                     Effects[j].xVSS.pFramingFilePath,
-                    (M4OSA_MemAddr8)pSettings->
+                    (void *)pSettings->
                     Effects[j].xVSS.pFramingFilePath, strlen(
                     pSettings->Effects[j].xVSS.pFramingFilePath) + 1);
 
@@ -3786,8 +3786,8 @@ replace3GP_3GP:
                 /**/
                 return M4ERR_ALLOC;
             }
-            M4OSA_memcpy((M4OSA_MemAddr8)framingCtx->pEffectFilePath,
-                (M4OSA_MemAddr8)pDecodedPath, length + 1);
+            memcpy((void *)framingCtx->pEffectFilePath,
+                (void *)pDecodedPath, length + 1);
 
             /* Save framing structure associated with corresponding effect */
             xVSS_context->pSettings->Effects[j].pExtVideoEffectFctCtxt =
@@ -4220,7 +4220,7 @@ replace3GP_3GP:
                     M4VS, (M4OSA_Char *)"Local text buffer effect");
 
                 //xVSS_context->pSettings->Effects[j].xVSS.pTextBuffer =
-                // M4OSA_malloc(M4OSA_chrLength(pSettings->Effects[j].xVSS.pTextBuffer)+1,
+                // M4OSA_malloc(strlen(pSettings->Effects[j].xVSS.pTextBuffer)+1,
                 // M4VS, "Local text buffer effect");
                 if( xVSS_context->pSettings->Effects[j].xVSS.pTextBuffer
                     == M4OSA_NULL )
@@ -4235,12 +4235,12 @@ replace3GP_3GP:
 
                 if( pSettings->Effects[j].xVSS.pTextBuffer != M4OSA_NULL )
                 {
-                    //M4OSA_memcpy((M4OSA_MemAddr8)xVSS_context->pSettings->Effects[j]
+                    //memcpy((M4OSA_MemAddr8)xVSS_context->pSettings->Effects[j]
                     //.xVSS.pTextBuffer, (M4OSA_MemAddr8)pSettings->Effects[j].xVSS.pTextBuffer,
-                    // M4OSA_chrLength(pSettings->Effects[j].xVSS.pTextBuffer)+1);
-                    M4OSA_memcpy((M4OSA_MemAddr8)xVSS_context->pSettings->
+                    // strlen(pSettings->Effects[j].xVSS.pTextBuffer)+1);
+                    memcpy((void *)xVSS_context->pSettings->
                         Effects[j].xVSS.pTextBuffer,
-                        (M4OSA_MemAddr8)pDecodedPath, xVSS_context->pSettings->
+                        (void *)pDecodedPath, xVSS_context->pSettings->
                         Effects[j].xVSS.textBufferSize + 1);
                 }
 
@@ -4537,8 +4537,8 @@ replace3GP_3GP:
         }
 
         /* Copy input structure to our structure */
-        M4OSA_memcpy((M4OSA_MemAddr8)xVSS_context->pSettings->xVSS.pBGMtrack,
-            (M4OSA_MemAddr8)pSettings->xVSS.pBGMtrack,
+        memcpy((void *)xVSS_context->pSettings->xVSS.pBGMtrack,
+            (void *)pSettings->xVSS.pBGMtrack,
             sizeof(M4xVSS_BGMSettings));
         /* Allocate file name, and copy file name buffer to our structure */
         xVSS_context->pSettings->xVSS.pBGMtrack->pFile =
@@ -4551,7 +4551,7 @@ replace3GP_3GP:
             M4OSA_TRACE1_0("Allocation error in M4xVSS_SendCommand");
             return M4ERR_ALLOC;
         }
-        M4OSA_memcpy(xVSS_context->pSettings->xVSS.pBGMtrack->pFile,
+        memcpy((void *)xVSS_context->pSettings->xVSS.pBGMtrack->pFile,
             (void *)pSettings->xVSS.pBGMtrack->pFile,
             strlen(pSettings->xVSS.pBGMtrack->pFile) + 1);
 
@@ -4836,7 +4836,7 @@ replace3GP_3GP:
             /**/
             return M4ERR_ALLOC;
         }
-        M4OSA_memcpy(xVSS_context->pcmPreviewFile, pDecodedPath, length + 1);
+        memcpy((void *)xVSS_context->pcmPreviewFile, (void *)pDecodedPath, length + 1);
 
         /* Free temporary output filename */
         if( out_pcm != M4OSA_NULL )
@@ -4856,7 +4856,7 @@ replace3GP_3GP:
         }
         pParams->pFileTemp = M4OSA_NULL;
 
-        M4OSA_memcpy(pParams->pFileOut, xVSS_context->pcmPreviewFile,
+        memcpy((void *)pParams->pFileOut,(void *) xVSS_context->pcmPreviewFile,
             (length + 1)); /* Copy output file path */
 
 #if 0
@@ -4927,7 +4927,7 @@ replace3GP_3GP:
             M4OSA_TRACE1_0("Allocation error in M4xVSS_SendCommand");
             return M4ERR_ALLOC;
         }
-        M4OSA_memcpy(pParams->pFileIn, pDecodedPath,
+        memcpy((void *)pParams->pFileIn, (void *)pDecodedPath,
             (length + 1)); /* Copy input file path */
 
         pParams->isBGM = M4OSA_TRUE;
@@ -5402,7 +5402,7 @@ M4OSA_ERR M4xVSS_SaveStart( M4OSA_Context pContext, M4OSA_Void *pFilePath,
             M4OSA_TRACE1_0("Allocation error in M4xVSS_SaveStart");
             return M4ERR_ALLOC;
         }
-        M4OSA_memcpy(xVSS_context->pOutputFile, pDecodedPath, filePathSize + 1);
+        memcpy((void *)xVSS_context->pOutputFile, (void *)pDecodedPath, filePathSize + 1);
         xVSS_context->pOutputFile[filePathSize] = '\0';
         xVSS_context->pSettings->pOutputFile = xVSS_context->pOutputFile;
         xVSS_context->pSettings->uiOutputPathSize = filePathSize;
@@ -5430,8 +5430,8 @@ M4OSA_ERR M4xVSS_SaveStart( M4OSA_Context pContext, M4OSA_Void *pFilePath,
     }
 
     /* Copy settings from input structure */
-    M4OSA_memcpy((M4OSA_MemAddr8) &(pEditSavingSettings->xVSS),
-        (M4OSA_MemAddr8) &(xVSS_context->pSettings->xVSS),
+    memcpy((void *) &(pEditSavingSettings->xVSS),
+        (void *) &(xVSS_context->pSettings->xVSS),
         sizeof(M4xVSS_EditSettings));
 
     /* Initialize pEditSavingSettings structure */
@@ -5596,8 +5596,8 @@ M4OSA_ERR M4xVSS_SaveStart( M4OSA_Context pContext, M4OSA_Void *pFilePath,
                     }
                     return M4ERR_ALLOC;
                 }
-                M4OSA_memcpy(pEditSavingSettings->pClipList[i]->pFile,
-                    pDecodedPath, length + 1);
+                memcpy((void *)pEditSavingSettings->pClipList[i]->pFile,
+                    (void *)pDecodedPath, length + 1);
             }
             /*FB: add file path size because of UTF 16 conversion*/
             pEditSavingSettings->pClipList[i]->filePathSize = length+1;
@@ -5606,9 +5606,9 @@ M4OSA_ERR M4xVSS_SaveStart( M4OSA_Context pContext, M4OSA_Void *pFilePath,
                 < xVSS_context->pSettings->uiClipNumber
                 - 1 ) /* Because there is 1 less transition than clip number */
             {
-                M4OSA_memcpy(
-                    (M4OSA_MemAddr8)pEditSavingSettings->pTransitionList[i],
-                    (M4OSA_MemAddr8)xVSS_context->pSettings->
+                memcpy(
+                    (void *)pEditSavingSettings->pTransitionList[i],
+                    (void *)xVSS_context->pSettings->
                     pTransitionList[i],
                     sizeof(M4VSS3GPP_TransitionSettings));
             }
@@ -5661,8 +5661,8 @@ M4OSA_ERR M4xVSS_SaveStart( M4OSA_Context pContext, M4OSA_Void *pFilePath,
 
         /* Just copy effect structure to saving structure, as effects time are now */
         /* relative to output clip time*/
-        M4OSA_memcpy((M4OSA_MemAddr8)pEditSavingSettings->Effects,
-            (M4OSA_MemAddr8)xVSS_context->pSettings->Effects,
+        memcpy((void *)pEditSavingSettings->Effects,
+            (void *)xVSS_context->pSettings->Effects,
             nbEffects * sizeof(M4VSS3GPP_EffectSettings));
     }
     else
@@ -5708,8 +5708,8 @@ M4OSA_ERR M4xVSS_SaveStart( M4OSA_Context pContext, M4OSA_Void *pFilePath,
 
         /* Just copy effect structure to saving structure, as effects time are now */
         /* relative to output clip time*/
-        M4OSA_memcpy((M4OSA_MemAddr8)pEditSavingSettings->xVSS.pBGMtrack,
-            (M4OSA_MemAddr8)xVSS_context->pSettings->xVSS.pBGMtrack,
+        memcpy((void *)pEditSavingSettings->xVSS.pBGMtrack,
+            (void *)xVSS_context->pSettings->xVSS.pBGMtrack,
             sizeof(M4xVSS_BGMSettings));
 
         /* Allocate file name, and copy file name buffer to our structure */
@@ -5730,8 +5730,8 @@ M4OSA_ERR M4xVSS_SaveStart( M4OSA_Context pContext, M4OSA_Void *pFilePath,
             }
             return M4ERR_ALLOC;
         }
-        M4OSA_memcpy(pEditSavingSettings->xVSS.pBGMtrack->pFile,
-            xVSS_context->pSettings->xVSS.pBGMtrack->pFile,
+        memcpy((void *)pEditSavingSettings->xVSS.pBGMtrack->pFile,
+            (void *)xVSS_context->pSettings->xVSS.pBGMtrack->pFile,
             strlen(xVSS_context->pSettings->xVSS.pBGMtrack->pFile)
             + 1);
 
@@ -5781,8 +5781,8 @@ M4OSA_ERR M4xVSS_SaveStart( M4OSA_Context pContext, M4OSA_Void *pFilePath,
                 }
                 return M4ERR_ALLOC;
             }
-            M4OSA_memcpy(pEditSavingSettings->xVSS.pBGMtrack->pFile,
-                pDecodedPath, length + 1);
+            memcpy((void *)pEditSavingSettings->xVSS.pBGMtrack->pFile,
+                (void *)pDecodedPath, length + 1);
         }
 
         /**/
@@ -5841,8 +5841,8 @@ M4OSA_ERR M4xVSS_SaveStart( M4OSA_Context pContext, M4OSA_Void *pFilePath,
             }
             return M4ERR_ALLOC;
         }
-        M4OSA_memcpy(xVSS_context->pCurrentEditSettings->pOutputFile,
-            pDecodedPath, length + 1);
+        memcpy((void *)xVSS_context->pCurrentEditSettings->pOutputFile,
+            (void *)pDecodedPath, length + 1);
         xVSS_context->pCurrentEditSettings->uiOutputPathSize = length + 1;
 
         /**
@@ -5892,8 +5892,8 @@ M4OSA_ERR M4xVSS_SaveStart( M4OSA_Context pContext, M4OSA_Void *pFilePath,
             }
             return M4ERR_ALLOC;
         }
-        M4OSA_memcpy(xVSS_context->pCurrentEditSettings->pTemporaryFile,
-            pDecodedPath, length + 1);
+        memcpy((void *)xVSS_context->pCurrentEditSettings->pTemporaryFile,
+            (void *)pDecodedPath, length + 1);
 
         /* Put nb of step for progression monitoring to 2, because audio mixing is needed */
         xVSS_context->nbStepTotal = 2;
@@ -6070,9 +6070,9 @@ M4OSA_ERR M4xVSS_Step( M4OSA_Context pContext, M4OSA_UInt8 *pProgress )
                                 - 1].filePathSize
                                 == pVSSContext->pClipList[i].filePathSize )
                             {
-                                cmpResult = M4OSA_memcmp(pVSSContext->
+                                cmpResult = memcmp((void *)pVSSContext->
                                     pClipList[pVSSContext->uiCurrentClip
-                                    - 1].pFile, pVSSContext->pClipList[i].pFile,
+                                    - 1].pFile, (void *)pVSSContext->pClipList[i].pFile,
                                     pVSSContext->
                                     pClipList[pVSSContext->uiCurrentClip
                                     - 1].filePathSize);
diff --git a/libvideoeditor/vss/src/M4xVSS_internal.c b/libvideoeditor/vss/src/M4xVSS_internal.c
index 4e4489d..53ee75a 100755
--- a/libvideoeditor/vss/src/M4xVSS_internal.c
+++ b/libvideoeditor/vss/src/M4xVSS_internal.c
@@ -878,12 +878,12 @@ M4OSA_ERR M4xVSS_PictureCallbackFct(M4OSA_Void* pPictureCtxt, M4VIFI_ImagePlane*
 
         if(pC->m_mediaRendering == M4xVSS_kBlackBorders)
         {
-            M4OSA_memset((M4OSA_MemAddr8)pImagePlanes[0].pac_data,
-                (pImagePlanes[0].u_height*pImagePlanes[0].u_stride),Y_PLANE_BORDER_VALUE);
-            M4OSA_memset((M4OSA_MemAddr8)pImagePlanes[1].pac_data,
-                (pImagePlanes[1].u_height*pImagePlanes[1].u_stride),U_PLANE_BORDER_VALUE);
-            M4OSA_memset((M4OSA_MemAddr8)pImagePlanes[2].pac_data,
-                (pImagePlanes[2].u_height*pImagePlanes[2].u_stride),V_PLANE_BORDER_VALUE);
+            memset((void *)pImagePlanes[0].pac_data,Y_PLANE_BORDER_VALUE,
+                (pImagePlanes[0].u_height*pImagePlanes[0].u_stride));
+            memset((void *)pImagePlanes[1].pac_data,U_PLANE_BORDER_VALUE,
+                (pImagePlanes[1].u_height*pImagePlanes[1].u_stride));
+            memset((void *)pImagePlanes[2].pac_data,V_PLANE_BORDER_VALUE,
+                (pImagePlanes[2].u_height*pImagePlanes[2].u_stride));
 
             /**
             First without pan&zoom*/
@@ -2166,7 +2166,7 @@ M4OSA_ERR M4xVSS_internalConvertARGB888toYUV420_FrammingEffect(M4OSA_Context pCo
 
         for(i=0;i<rgbPlane.u_height;i++)
         {
-            M4OSA_memcpy((M4OSA_MemAddr8)output_pac_data, (M4OSA_MemAddr8)input_pac_data,
+            memcpy((void *)output_pac_data, (void *)input_pac_data,
                  (rgbPlane.u_width-1)*2);
 
             output_pac_data += ((rgbPlane.u_width-1)*2);
@@ -3852,32 +3852,32 @@ M4OSA_ERR M4VSS3GPP_externalVideoEffectColor(M4OSA_Void *pFunctionContext,
                 switch (ColorContext->colorEffectType)
                 {
                     case M4xVSS_kVideoEffectType_BlackAndWhite:
-                        M4OSA_memset((M4OSA_MemAddr8)p_buf_dest,
-                         PlaneIn[plane_number].u_width, 128);
+                        memset((void *)p_buf_dest,128,
+                         PlaneIn[plane_number].u_width);
                         break;
                     case M4xVSS_kVideoEffectType_Pink:
-                        M4OSA_memset((M4OSA_MemAddr8)p_buf_dest,
-                         PlaneIn[plane_number].u_width, 255);
+                        memset((void *)p_buf_dest,255,
+                         PlaneIn[plane_number].u_width);
                         break;
                     case M4xVSS_kVideoEffectType_Green:
-                        M4OSA_memset((M4OSA_MemAddr8)p_buf_dest,
-                         PlaneIn[plane_number].u_width, 0);
+                        memset((void *)p_buf_dest,0,
+                         PlaneIn[plane_number].u_width);
                         break;
                     case M4xVSS_kVideoEffectType_Sepia:
                         if(plane_number==1)
                         {
-                            M4OSA_memset((M4OSA_MemAddr8)p_buf_dest,
-                             PlaneIn[plane_number].u_width, 117);
+                            memset((void *)p_buf_dest,117,
+                             PlaneIn[plane_number].u_width);
                         }
                         else
                         {
-                            M4OSA_memset((M4OSA_MemAddr8)p_buf_dest,
-                             PlaneIn[plane_number].u_width, 139);
+                            memset((void *)p_buf_dest,139,
+                             PlaneIn[plane_number].u_width);
                         }
                         break;
                     case M4xVSS_kVideoEffectType_Negative:
-                        M4OSA_memcpy((M4OSA_MemAddr8)p_buf_dest,
-                         (M4OSA_MemAddr8)p_buf_src ,PlaneOut[plane_number].u_width);
+                        memcpy((void *)p_buf_dest,
+                         (void *)p_buf_src ,PlaneOut[plane_number].u_width);
                         break;
 
                     case M4xVSS_kVideoEffectType_ColorRGB16:
@@ -3894,15 +3894,15 @@ M4OSA_ERR M4VSS3GPP_externalVideoEffectColor(M4OSA_Void *pFunctionContext,
                             {
                                 /*then convert to u*/
                                 u = U16(r, g, b);
-                                M4OSA_memset((M4OSA_MemAddr8)p_buf_dest,
-                                 PlaneIn[plane_number].u_width, (M4OSA_UInt8)u);
+                                memset((void *)p_buf_dest,(M4OSA_UInt8)u,
+                                 PlaneIn[plane_number].u_width);
                             }
                             if(plane_number==2)
                             {
                                 /*then convert to v*/
                                 v = V16(r, g, b);
-                                M4OSA_memset((M4OSA_MemAddr8)p_buf_dest,
-                                 PlaneIn[plane_number].u_width, (M4OSA_UInt8)v);
+                                memset((void *)p_buf_dest, (M4OSA_UInt8)v,
+                                 PlaneIn[plane_number].u_width);
                             }
                         }
                         break;
@@ -3925,15 +3925,15 @@ M4OSA_ERR M4VSS3GPP_externalVideoEffectColor(M4OSA_Void *pFunctionContext,
                             {
                                 /*then convert to u*/
                                 u = U16(r, g, b);
-                                M4OSA_memset((M4OSA_MemAddr8)p_buf_dest,
-                                 PlaneIn[plane_number].u_width, (M4OSA_UInt8)u);
+                                memset((void *)p_buf_dest,(M4OSA_UInt8)u,
+                                 PlaneIn[plane_number].u_width);
                             }
                             if(plane_number==2)
                             {
                                 /*then convert to v*/
                                 v = V16(r, g, b);
-                                M4OSA_memset((M4OSA_MemAddr8)p_buf_dest,
-                                 PlaneIn[plane_number].u_width, (M4OSA_UInt8)v);
+                                memset((void *)p_buf_dest,(M4OSA_UInt8)v,
+                                 PlaneIn[plane_number].u_width);
                             }
                         }
                         break;
@@ -3956,8 +3956,8 @@ M4OSA_ERR M4VSS3GPP_externalVideoEffectColor(M4OSA_Void *pFunctionContext,
                     }
                     break;
                 default:
-                    M4OSA_memcpy((M4OSA_MemAddr8)p_buf_dest,
-                     (M4OSA_MemAddr8)p_buf_src ,PlaneOut[plane_number].u_width);
+                    memcpy((void *)p_buf_dest,
+                     (void *)p_buf_src ,PlaneOut[plane_number].u_width);
                     break;
                 }
             }
@@ -4302,11 +4302,9 @@ M4OSA_ERR M4VSS3GPP_externalVideoEffectFifties( M4OSA_Void *pUserData,
         for (x = 0; x < pPlaneOut[plane_number].u_height; x++)
         {
             if (1 == plane_number)
-                M4OSA_memset((M4OSA_MemAddr8)pOutCr, pPlaneIn[plane_number].u_width,
-                     117); /* U value */
+                memset((void *)pOutCr, 117,pPlaneIn[plane_number].u_width); /* U value */
             else
-                M4OSA_memset((M4OSA_MemAddr8)pOutCr, pPlaneIn[plane_number].u_width,
-                     139); /* V value */
+                memset((void *)pOutCr, 139,pPlaneIn[plane_number].u_width); /* V value */
 
             pInCr  += pPlaneIn[plane_number].u_stride;
             pOutCr += pPlaneOut[plane_number].u_stride;
@@ -4700,7 +4698,7 @@ static void M4XXX_CopyPlane(M4VIFI_ImagePlane* dest, M4VIFI_ImagePlane* source)
 
     for (y=0; y<height; y++)
     {
-        M4OSA_memcpy((M4OSA_MemAddr8)destWalk, (M4OSA_MemAddr8)sourceWalk, width);
+        memcpy((void *)destWalk, (void *)sourceWalk, width);
         destWalk += destStride;
         sourceWalk += sourceStride;
     }
@@ -4742,7 +4740,7 @@ static M4OSA_ERR M4xVSS_VerticalSlideTransition(M4VIFI_ImagePlane* topPlane,
         /* First the part from the top source clip frame. */
         for (y=0; y<topPartHeight; y++)
         {
-            M4OSA_memcpy((M4OSA_MemAddr8)destWalk, (M4OSA_MemAddr8)sourceWalk, width);
+            memcpy((void *)destWalk, (void *)sourceWalk, width);
             destWalk += destStride;
             sourceWalk += sourceStride;
         }
@@ -4755,7 +4753,7 @@ static M4OSA_ERR M4xVSS_VerticalSlideTransition(M4VIFI_ImagePlane* topPlane,
 
         for (y=0; y<bottomPartHeight; y++)
         {
-            M4OSA_memcpy((M4OSA_MemAddr8)destWalk, (M4OSA_MemAddr8)sourceWalk, width);
+            memcpy((void *)destWalk, (void *)sourceWalk, width);
             destWalk += destStride;
             sourceWalk += sourceStride;
         }
@@ -4828,10 +4826,10 @@ static M4OSA_ERR M4xVSS_HorizontalSlideTransition(M4VIFI_ImagePlane* leftPlane,
 
         for (y=0; y<height; y++)
         {
-            M4OSA_memcpy((M4OSA_MemAddr8)destWalkLeft, (M4OSA_MemAddr8)leftWalk, leftPartWidth);
+            memcpy((void *)destWalkLeft, (void *)leftWalk, leftPartWidth);
             leftWalk += leftStride;
 
-            M4OSA_memcpy((M4OSA_MemAddr8)destWalkRight, (M4OSA_MemAddr8)rightWalk, rightPartWidth);
+            memcpy((void *)destWalkRight, (void *)rightWalk, rightPartWidth);
             rightWalk += rightStride;
 
             destWalkLeft += destStride;
@@ -4997,8 +4995,8 @@ M4OSA_ERR M4xVSS_internalConvertToUTF8(M4OSA_Context pContext, M4OSA_Void* pBuff
     {
         M4OSA_UInt32 ConvertedSize = xVSS_context->UTFConversionContext.m_TempOutConversionSize;
 
-        M4OSA_memset((M4OSA_MemAddr8)xVSS_context->UTFConversionContext.pTempOutConversionBuffer
-            ,(M4OSA_UInt32)xVSS_context->UTFConversionContext.m_TempOutConversionSize,0);
+        memset((void *)xVSS_context->UTFConversionContext.pTempOutConversionBuffer,0
+            ,(M4OSA_UInt32)xVSS_context->UTFConversionContext.m_TempOutConversionSize);
 
         err = xVSS_context->UTFConversionContext.pConvToUTF8Fct((M4OSA_Void*)pBufferIn,
             (M4OSA_UInt8*)xVSS_context->UTFConversionContext.pTempOutConversionBuffer,
@@ -5022,9 +5020,9 @@ M4OSA_ERR M4xVSS_internalConvertToUTF8(M4OSA_Context pContext, M4OSA_Void* pBuff
             }
             xVSS_context->UTFConversionContext.m_TempOutConversionSize = ConvertedSize;
 
-            M4OSA_memset((M4OSA_MemAddr8)xVSS_context->\
-                UTFConversionContext.pTempOutConversionBuffer,(M4OSA_UInt32)xVSS_context->\
-                    UTFConversionContext.m_TempOutConversionSize,0);
+            memset((void *)xVSS_context->\
+                UTFConversionContext.pTempOutConversionBuffer,0,(M4OSA_UInt32)xVSS_context->\
+                    UTFConversionContext.m_TempOutConversionSize);
 
             err = xVSS_context->UTFConversionContext.pConvToUTF8Fct((M4OSA_Void*)pBufferIn,
                 (M4OSA_Void*)xVSS_context->UTFConversionContext.pTempOutConversionBuffer,
@@ -5075,9 +5073,9 @@ M4OSA_ERR M4xVSS_internalConvertFromUTF8(M4OSA_Context pContext, M4OSA_Void* pBu
     {
         M4OSA_UInt32 ConvertedSize = xVSS_context->UTFConversionContext.m_TempOutConversionSize;
 
-        M4OSA_memset((M4OSA_MemAddr8)xVSS_context->\
-            UTFConversionContext.pTempOutConversionBuffer,(M4OSA_UInt32)xVSS_context->\
-                UTFConversionContext.m_TempOutConversionSize,0);
+        memset((void *)xVSS_context->\
+            UTFConversionContext.pTempOutConversionBuffer,0,(M4OSA_UInt32)xVSS_context->\
+                UTFConversionContext.m_TempOutConversionSize);
 
         err = xVSS_context->UTFConversionContext.pConvFromUTF8Fct\
             ((M4OSA_Void*)pBufferIn,(M4OSA_UInt8*)xVSS_context->\
@@ -5101,9 +5099,9 @@ M4OSA_ERR M4xVSS_internalConvertFromUTF8(M4OSA_Context pContext, M4OSA_Void* pBu
             }
             xVSS_context->UTFConversionContext.m_TempOutConversionSize = ConvertedSize;
 
-            M4OSA_memset((M4OSA_MemAddr8)xVSS_context->\
-                UTFConversionContext.pTempOutConversionBuffer,(M4OSA_UInt32)xVSS_context->\
-                    UTFConversionContext.m_TempOutConversionSize,0);
+            memset((void *)xVSS_context->\
+                UTFConversionContext.pTempOutConversionBuffer,0,(M4OSA_UInt32)xVSS_context->\
+                    UTFConversionContext.m_TempOutConversionSize);
 
             err = xVSS_context->UTFConversionContext.pConvFromUTF8Fct((M4OSA_Void*)pBufferIn,
                 (M4OSA_Void*)xVSS_context->UTFConversionContext.pTempOutConversionBuffer,
diff --git a/libvideoeditor/vss/stagefrightshells/inc/VideoEditorUtils.h b/libvideoeditor/vss/stagefrightshells/inc/VideoEditorUtils.h
index e06fcbc..29993bc 100755
--- a/libvideoeditor/vss/stagefrightshells/inc/VideoEditorUtils.h
+++ b/libvideoeditor/vss/stagefrightshells/inc/VideoEditorUtils.h
@@ -77,7 +77,7 @@
 { \
     (p) = (type*)M4OSA_malloc(sizeof(type)*(count), 0xFF,(M4OSA_Char*)comment);\
     VIDEOEDITOR_CHECK(M4OSA_NULL != (p), M4ERR_ALLOC); \
-    M4OSA_memset((M4OSA_MemAddr8)(p), sizeof(type)*(count), 0); \
+    memset((void *)(p), 0,sizeof(type)*(count)); \
 }
 
 
diff --git a/libvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp b/libvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp
index 84c1ec5..7f74685 100755
--- a/libvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp
+++ b/libvideoeditor/vss/stagefrightshells/src/VideoEditor3gpReader.cpp
@@ -1097,8 +1097,8 @@ M4OSA_ERR VideoEditor3gpReader_getNextAu(M4OSA_Context context,
         }
         pAu->size = mMediaBuffer->range_length();
 
-        memcpy((M4OSA_MemAddr8)pAu->dataAddress,
-            (const char *)mMediaBuffer->data() + mMediaBuffer->range_offset(),
+        memcpy((void *)pAu->dataAddress,
+            (void *)((const char *)mMediaBuffer->data() + mMediaBuffer->range_offset()),
             mMediaBuffer->range_length());
 
         if( (pStreamHandler == (M4_StreamHandler*)pC->mVideoStreamHandler)  &&
@@ -1381,8 +1381,8 @@ static M4OSA_ERR VideoEditor3gpReader_AnalyseAvcDsi(
         goto cleanup;
     }
 
-    M4OSA_memcpy((M4OSA_MemAddr8 ) pStreamHandler->m_pH264DecoderSpecificInfo,
-        (M4OSA_MemAddr8 )pDecoderConfigLocal,
+    memcpy((void * ) pStreamHandler->m_pH264DecoderSpecificInfo,
+        (void * )pDecoderConfigLocal,
         pStreamHandler->m_H264decoderSpecificInfoSize);
     return M4NO_ERROR;
 cleanup:
@@ -1537,8 +1537,8 @@ M4OSA_ERR VideoEditor3gpReader_getNextStreamHandler(M4OSA_Context context,
                             if (M4OSA_NULL == DecoderSpecific) {
                                 return M4ERR_ALLOC;
                             }
-                            M4OSA_memcpy((M4OSA_MemAddr8)DecoderSpecific,
-                                (M4OSA_MemAddr8)data, size);
+                            memcpy((void *)DecoderSpecific,
+                                (void *)data, size);
                             (*pStreamHandler)->m_pDecoderSpecificInfo =
                                 DecoderSpecific;
                         }
@@ -1573,8 +1573,8 @@ M4OSA_ERR VideoEditor3gpReader_getNextStreamHandler(M4OSA_Context context,
                                 LOGV("VideoEditor3gp_getNextStream is NULL ");
                                 return M4ERR_ALLOC;
                             }
-                            M4OSA_memcpy((M4OSA_MemAddr8)DecoderSpecificInfo,
-                                (M4OSA_MemAddr8)data, decoderSpecificInfoSize);
+                            memcpy((void *)DecoderSpecificInfo,
+                                (void *)data, decoderSpecificInfoSize);
                         } else {
                             LOGV("DSI Size %d", decoderSpecificInfoSize);
                             DecoderSpecificInfo = M4OSA_NULL;
@@ -1609,8 +1609,8 @@ M4OSA_ERR VideoEditor3gpReader_getNextStreamHandler(M4OSA_Context context,
                         if (M4OSA_NULL == (*pStreamHandler)->m_pESDSInfo) {
                             return M4ERR_ALLOC;
                         }
-                        M4OSA_memcpy((M4OSA_MemAddr8)(*pStreamHandler)->\
-                            m_pESDSInfo, (M4OSA_MemAddr8)data, size);
+                        memcpy((void *)(*pStreamHandler)->\
+                            m_pESDSInfo, (void *)data, size);
 
                         esds.getCodecSpecificInfo(&codec_specific_data,
                             &codec_specific_data_size);
@@ -1626,8 +1626,8 @@ M4OSA_ERR VideoEditor3gpReader_getNextStreamHandler(M4OSA_Context context,
                             if (M4OSA_NULL == DecoderSpecific) {
                                 return M4ERR_ALLOC;
                             }
-                            M4OSA_memcpy((M4OSA_MemAddr8)DecoderSpecific,
-                                (M4OSA_MemAddr8)codec_specific_data,
+                            memcpy((void *)DecoderSpecific,
+                                (void *)codec_specific_data,
                                 codec_specific_data_size);
                             (*pStreamHandler)->m_pDecoderSpecificInfo =
                                 DecoderSpecific;
@@ -1727,8 +1727,8 @@ M4OSA_ERR VideoEditor3gpReader_getNextStreamHandler(M4OSA_Context context,
                         if (M4OSA_NULL == DecoderSpecific) {
                             return M4ERR_ALLOC;
                         }
-                        M4OSA_memcpy((M4OSA_MemAddr8)DecoderSpecific,
-                            (M4OSA_MemAddr8)codec_specific_data,
+                        memcpy((void *)DecoderSpecific,
+                            (void *)codec_specific_data,
                             codec_specific_data_size);
                         (*pStreamHandler)->m_pDecoderSpecificInfo =
                             DecoderSpecific;
@@ -1769,8 +1769,8 @@ M4OSA_ERR VideoEditor3gpReader_getNextStreamHandler(M4OSA_Context context,
                     if (M4OSA_NULL == (*pStreamHandler)->m_pESDSInfo) {
                         return M4ERR_ALLOC;
                     }
-                    M4OSA_memcpy((M4OSA_MemAddr8)(*pStreamHandler)->m_pESDSInfo,
-                    (M4OSA_MemAddr8)data, size);
+                    memcpy((void *)(*pStreamHandler)->m_pESDSInfo,
+                    (void *)data, size);
                     esds.getCodecSpecificInfo(&codec_specific_data,
                         &codec_specific_data_size);
 
@@ -1786,8 +1786,8 @@ M4OSA_ERR VideoEditor3gpReader_getNextStreamHandler(M4OSA_Context context,
                         if (M4OSA_NULL == DecoderSpecific) {
                             return M4ERR_ALLOC;
                         }
-                        M4OSA_memcpy((M4OSA_MemAddr8)DecoderSpecific,
-                            (M4OSA_MemAddr8)codec_specific_data,
+                        memcpy((void *)DecoderSpecific,
+                            (void *)codec_specific_data,
                             codec_specific_data_size);
                         (*pStreamHandler)->m_pDecoderSpecificInfo =
                             DecoderSpecific;
diff --git a/libvideoeditor/vss/stagefrightshells/src/VideoEditorAudioDecoder.cpp b/libvideoeditor/vss/stagefrightshells/src/VideoEditorAudioDecoder.cpp
index a1f62cb..928f8ea 100755
--- a/libvideoeditor/vss/stagefrightshells/src/VideoEditorAudioDecoder.cpp
+++ b/libvideoeditor/vss/stagefrightshells/src/VideoEditorAudioDecoder.cpp
@@ -487,8 +487,8 @@ M4OSA_ERR VideoEditorAudioDecoder_create(M4AD_Type decoderType,
 
             // Copy the stream properties into userdata
             if( M4OSA_NULL != pUserData ) {
-                M4OSA_memcpy((M4OSA_MemAddr8)pUserData,
-                    (M4OSA_MemAddr8)&aacProperties,
+                memcpy((void *)pUserData,
+                    (void *)&aacProperties,
                     sizeof(AAC_DEC_STREAM_PROPS));
             }
             break;
@@ -604,8 +604,8 @@ M4OSA_ERR VideoEditorAudioDecoder_processInputBuffer(
 
     if( M4OSA_NULL != pInputBuffer ) {
         buffer = new MediaBuffer((size_t)pInputBuffer->m_bufferSize);
-        M4OSA_memcpy((M4OSA_Int8*)buffer->data() + buffer->range_offset(),
-            pInputBuffer->m_dataAddress, pInputBuffer->m_bufferSize);
+        memcpy((void *)((M4OSA_Int8*)buffer->data() + buffer->range_offset()),
+            (void *)pInputBuffer->m_dataAddress, pInputBuffer->m_bufferSize);
     }
     nbBuffer = pDecoderContext->mDecoderSource->storeBuffer(buffer);
 
@@ -647,8 +647,8 @@ M4OSA_ERR VideoEditorAudioDecoder_processOutputBuffer(M4AD_Context pContext,
         (M4OSA_UInt32)pDecoderContext->mNbOutputChannels ) {
         // Just copy the PCMs
         pOuputBuffer->m_bufferSize = (M4OSA_UInt32)buffer->range_length();
-        M4OSA_memcpy(pOuputBuffer->m_dataAddress,
-            ((M4OSA_MemAddr8)buffer->data())+buffer->range_offset(),
+        memcpy((void *)pOuputBuffer->m_dataAddress,
+            (void *)(((M4OSA_MemAddr8)buffer->data())+buffer->range_offset()),
             buffer->range_length());
     } else if( pDecoderContext->mAudioStreamHandler->m_nbChannels <
         (M4OSA_UInt32)pDecoderContext->mNbOutputChannels ) {
diff --git a/libvideoeditor/vss/stagefrightshells/src/VideoEditorAudioEncoder.cpp b/libvideoeditor/vss/stagefrightshells/src/VideoEditorAudioEncoder.cpp
index 718881f..bcae1a8 100755
--- a/libvideoeditor/vss/stagefrightshells/src/VideoEditorAudioEncoder.cpp
+++ b/libvideoeditor/vss/stagefrightshells/src/VideoEditorAudioEncoder.cpp
@@ -459,8 +459,8 @@ M4OSA_ERR VideoEditorAudioEncoder_open(M4OSA_Context pContext,
         SAFE_MALLOC(pEncoderContext->mDSI.pInfo, M4OSA_Int8,
             pEncoderContext->mDSI.infoSize, "Encoder header");
 
-        M4OSA_memcpy(pEncoderContext->mDSI.pInfo,
-            (M4OSA_MemAddr8)(buffer->data())+buffer->range_offset(),
+        memcpy((void *)pEncoderContext->mDSI.pInfo,
+            (void *)((M4OSA_MemAddr8)(buffer->data())+buffer->range_offset()),
             pEncoderContext->mDSI.infoSize);
 
         buffer->release();
@@ -499,7 +499,7 @@ M4OSA_ERR VideoEditorAudioEncoder_processInputBuffer(M4OSA_Context pContext,
             // Let the MediaBuffer own the data so we don't have to free it
             buffer = new MediaBuffer((size_t)pInBuffer->pTableBufferSize[0]);
             pData = (M4OSA_Int8*)buffer->data() + buffer->range_offset();
-            M4OSA_memcpy(pData, pInBuffer->pTableBuffer[0],
+            memcpy((void *)pData, (void *)pInBuffer->pTableBuffer[0],
                 pInBuffer->pTableBufferSize[0]);
             break;
         default:
@@ -568,8 +568,8 @@ M4OSA_ERR VideoEditorAudioEncoder_processOutputBuffer(M4OSA_Context pContext,
         pEncoderContext->mLastOutputCts = i64Tmp;
 
         // Format the AU
-        M4OSA_memcpy(pOutBuffer->pTableBuffer[0],
-            (M4OSA_MemAddr8)(buffer->data())+buffer->range_offset(),
+        memcpy((void *)pOutBuffer->pTableBuffer[0],
+            (void *)((M4OSA_MemAddr8)(buffer->data())+buffer->range_offset()),
             buffer->range_length());
         pOutBuffer->pTableBufferSize[0] = (M4OSA_UInt32)buffer->range_length();
     }
diff --git a/libvideoeditor/vss/stagefrightshells/src/VideoEditorBuffer.c b/libvideoeditor/vss/stagefrightshells/src/VideoEditorBuffer.c
index e4de140..2f534db 100755
--- a/libvideoeditor/vss/stagefrightshells/src/VideoEditorBuffer.c
+++ b/libvideoeditor/vss/stagefrightshells/src/VideoEditorBuffer.c
@@ -93,8 +93,8 @@ M4OSA_ERR VIDEOEDITOR_BUFFER_allocatePool(VIDEOEDITOR_BUFFER_Pool** ppool,
 
     LOGV("VIDEOEDITOR_BUFFER_allocatePool : Assigning Pool name buffer");
 
-    M4OSA_memset(pool->poolName, VIDEOEDITOR_BUFFEPOOL_MAX_NAME_SIZE, 0);
-    M4OSA_memcpy(pool->poolName, poolName,
+    memset((void *)pool->poolName, 0,VIDEOEDITOR_BUFFEPOOL_MAX_NAME_SIZE);
+    memcpy((void *)pool->poolName, (void *)poolName,
         VIDEOEDITOR_BUFFEPOOL_MAX_NAME_SIZE-1);
 
     pool->NB = nbBuffers;
diff --git a/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp b/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
index 5f6b90c..fb0d89e 100755
--- a/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
+++ b/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
@@ -200,7 +200,7 @@ status_t VideoEditorVideoDecoderSource::read(MediaBuffer** buffer_out,
             ? (M4OSA_UInt32)mMaxAUSize : pAccessUnit->m_size;
         LOGV("VideoDecoderSource:Read() copying AU to i/p buffer of decoder,"
             "Bufer Add = 0x%x, size = %d", mBuffer->data(), lSize);
-        M4OSA_memcpy((M4OSA_MemAddr8)mBuffer->data(),pAccessUnit->m_dataAddress,
+        memcpy((void *)mBuffer->data(),(void *)pAccessUnit->m_dataAddress,
             lSize);
 
         mBuffer->set_range(0, lSize);
@@ -612,7 +612,7 @@ M4VIFI_UInt8 M4VIFI_SemiplanarYVU420toYUV420(void *user_data,
         (uint16_t *) &(PlaneOut[2].pac_data[PlaneOut[2].u_topleft]);
 
     /* Y copying */
-    memcpy(outy, inyuv, outYsize);
+    memcpy((void *)outy, (void *)inyuv, outYsize);
 
     /* U & V copying */
     uint32_t *inyuv_4 = (uint32_t *) (inyuv + outYsize);
@@ -1379,15 +1379,15 @@ M4OSA_ERR VideoEditorVideoDecoder_decode(M4OSA_Context context,
                 {
                     M4OSA_MemAddr8 pTmpBuff = (M4OSA_MemAddr8)pDecoderBuffer->data() + pDecoderBuffer->range_offset();
 
-                    M4OSA_memcpy((M4OSA_MemAddr8)tmpDecBuffer->pData, pTmpBuff, yPlaneSize);
+                    memcpy((void *)tmpDecBuffer->pData, (void *)pTmpBuff, yPlaneSize);
 
                     offsetSrc += pDecShellContext->mGivenWidth * pDecShellContext->mGivenHeight;
-                    M4OSA_memcpy((M4OSA_MemAddr8)tmpDecBuffer->pData + yPlaneSize,
-                        pTmpBuff + offsetSrc, uvPlaneSize);
+                    memcpy((void *)((M4OSA_MemAddr8)tmpDecBuffer->pData + yPlaneSize),
+                        (void *)(pTmpBuff + offsetSrc), uvPlaneSize);
 
                     offsetSrc += (pDecShellContext->mGivenWidth >> 1) * (pDecShellContext->mGivenHeight >> 1);
-                    M4OSA_memcpy((M4OSA_MemAddr8)tmpDecBuffer->pData + yPlaneSize + uvPlaneSize,
-                        pTmpBuff + offsetSrc, uvPlaneSize);
+                    memcpy((void *)((M4OSA_MemAddr8)tmpDecBuffer->pData + yPlaneSize + uvPlaneSize),
+                        (void *)(pTmpBuff + offsetSrc), uvPlaneSize);
                 }
                 else
                 {
@@ -1397,7 +1397,7 @@ M4OSA_ERR VideoEditorVideoDecoder_decode(M4OSA_Context context,
 
                     for ( index = 0; index < height; index++)
                     {
-                        memcpy(pTmpBuffDst, pTmpBuff, width);
+                        memcpy((void *)pTmpBuffDst, (void *)pTmpBuff, width);
                         pTmpBuffDst += width;
                         pTmpBuff += pDecShellContext->mGivenWidth;
                     }
@@ -1405,7 +1405,7 @@ M4OSA_ERR VideoEditorVideoDecoder_decode(M4OSA_Context context,
                     pTmpBuff += (pDecShellContext->mGivenWidth * ( pDecShellContext->mGivenHeight - height));
                     for ( index = 0; index < height >> 1; index++)
                     {
-                        memcpy(pTmpBuffDst, pTmpBuff, width >> 1);
+                        memcpy((void *)pTmpBuffDst, (void *)pTmpBuff, width >> 1);
                         pTmpBuffDst += width >> 1;
                         pTmpBuff += pDecShellContext->mGivenWidth >> 1;
                     }
@@ -1413,7 +1413,7 @@ M4OSA_ERR VideoEditorVideoDecoder_decode(M4OSA_Context context,
                     pTmpBuff += ((pDecShellContext->mGivenWidth * (pDecShellContext->mGivenHeight - height)) / 4);
                     for ( index = 0; index < height >> 1; index++)
                     {
-                        memcpy(pTmpBuffDst, pTmpBuff, width >> 1);
+                        memcpy((void *)pTmpBuffDst, (void *)pTmpBuff, width >> 1);
                         pTmpBuffDst += width >> 1;
                         pTmpBuff += pDecShellContext->mGivenWidth >> 1;
                     }
@@ -1554,13 +1554,13 @@ M4OSA_ERR VideoEditorVideoDecoder_render(M4OSA_Context context,
         M4OSA_UInt32 tempHeight =
             pDecShellContext->m_pVideoStreamhandler->m_videoHeight;
 
-        M4OSA_memcpy((M4OSA_MemAddr8) pOutputPlane[0].pac_data, tempBuffPtr,
+        memcpy((void *) pOutputPlane[0].pac_data, (void *)tempBuffPtr,
             tempWidth * tempHeight);
         tempBuffPtr += (tempWidth * tempHeight);
-        M4OSA_memcpy((M4OSA_MemAddr8) pOutputPlane[1].pac_data, tempBuffPtr,
+        memcpy((void *) pOutputPlane[1].pac_data, (void *)tempBuffPtr,
             (tempWidth/2) * (tempHeight/2));
         tempBuffPtr += ((tempWidth/2) * (tempHeight/2));
-        M4OSA_memcpy((M4OSA_MemAddr8) pOutputPlane[2].pac_data, tempBuffPtr,
+        memcpy((void *) pOutputPlane[2].pac_data, (void *)tempBuffPtr,
             (tempWidth/2) * (tempHeight/2));
     }
 
diff --git a/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp b/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
index 3112f71..968b39b 100755
--- a/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
+++ b/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
@@ -360,8 +360,8 @@ M4OSA_ERR VideoEditorVideoEncoder_getDSI(M4ENCODER_Context pContext,
             (M4OSA_UInt32)outputBuffer->range_length();
         SAFE_MALLOC(pEncoderContext->mHeader.pBuf, M4OSA_Int8,
             pEncoderContext->mHeader.Size, "Encoder header");
-        M4OSA_memcpy(pEncoderContext->mHeader.pBuf,
-            (M4OSA_MemAddr8)(outputBuffer->data())+outputBuffer->range_offset(),
+        memcpy((void *)pEncoderContext->mHeader.pBuf,
+            (void *)((M4OSA_MemAddr8)(outputBuffer->data())+outputBuffer->range_offset()),
             pEncoderContext->mHeader.Size);
         outputBuffer->release();
     }
@@ -835,8 +835,8 @@ M4OSA_ERR VideoEditorVideoEncoder_processOutputBuffer(
                 (M4OSA_UInt32)buffer->range_length();
             SAFE_MALLOC(pEncoderContext->mHeader.pBuf, M4OSA_Int8,
                 pEncoderContext->mHeader.Size, "Encoder header");
-            M4OSA_memcpy(pEncoderContext->mHeader.pBuf,
-                (M4OSA_MemAddr8)(buffer->data())+buffer->range_offset(),
+            memcpy((void *)pEncoderContext->mHeader.pBuf,
+                (void *)((M4OSA_MemAddr8)(buffer->data())+buffer->range_offset()),
                 pEncoderContext->mHeader.Size);
         }
 #endif /* VIDEOEDITOR_ENCODER_GET_DSI_AT_CREATION */
@@ -897,9 +897,9 @@ M4OSA_ERR VideoEditorVideoEncoder_processOutputBuffer(
         pEncoderContext->mAccessUnit->size = (M4OSA_UInt32)outputSize;
         } else {
             // The AU can just be copied
-            M4OSA_memcpy((M4OSA_MemAddr8)pEncoderContext->mAccessUnit->\
-                dataAddress, (M4OSA_MemAddr8)(buffer->data())+buffer->\
-                range_offset(), buffer->range_length());
+            memcpy((void *)pEncoderContext->mAccessUnit->\
+                dataAddress, (void *)((M4OSA_MemAddr8)(buffer->data())+buffer->\
+                range_offset()), buffer->range_length());
             pEncoderContext->mAccessUnit->size =
                 (M4OSA_UInt32)buffer->range_length();
         }
diff --git a/libvideoeditor/vss/video_filters/src/M4VFL_transition.c b/libvideoeditor/vss/video_filters/src/M4VFL_transition.c
index 7d7ca44..d63c7a5 100755
--- a/libvideoeditor/vss/video_filters/src/M4VFL_transition.c
+++ b/libvideoeditor/vss/video_filters/src/M4VFL_transition.c
@@ -71,7 +71,7 @@ unsigned char M4VFL_modifyLumaByStep(M4ViComImagePlane *plane_in, M4ViComImagePl
         /* very specific case : set luma plane to 16 */
         for (j = u_height; j != 0; j--)
         {
-            M4OSA_memset((M4OSA_MemAddr8)p_dest, u_width, 16);
+            memset((void *)p_dest,16, u_width);
             p_dest += u_stride_out;
         }
         return 0;
@@ -142,7 +142,7 @@ unsigned char M4VFL_modifyLumaByStep(M4ViComImagePlane *plane_in, M4ViComImagePl
         /* very specific case : set luma plane to 16 */
         for (j = u_height; j != 0; j--)
         {
-            M4OSA_memset((M4OSA_MemAddr8)p_dest, u_width, 16);
+            memset((void *)p_dest, 16,u_width);
             p_dest += u_stride_out;
         }
         return 0;
@@ -230,8 +230,8 @@ unsigned char M4VFL_modifyLumaWithScale(M4ViComImagePlane *plane_in,
         {
             for (i = u_width; i != 0; i--)
             {
-                M4OSA_memcpy((M4OSA_MemAddr8)p_cdest_line, (M4OSA_MemAddr8)p_csrc_line, u_width);
-                M4OSA_memcpy((M4OSA_MemAddr8)p_cdest,(M4OSA_MemAddr8) p_csrc, u_width);
+                memcpy((void *)p_cdest_line, (void *)p_csrc_line, u_width);
+                memcpy((void *)p_cdest,(void *) p_csrc, u_width);
             }
             p_cdest_line += u_stride_out;
             p_cdest += u_stride_out;
@@ -321,12 +321,12 @@ unsigned char M4VFL_applyClosingCurtain(M4ViComImagePlane *plane_in, M4ViComImag
 
     for (j = (nb_black_lines >> 1); j != 0; j--)
     { /* set black lines */
-        M4OSA_memset((M4OSA_MemAddr8)p_dest, u_width, 0);
+        memset((void *)p_dest, 0,u_width);
         p_dest += u_stride_out;
-        M4OSA_memset((M4OSA_MemAddr8)p_dest, u_width, 0);
+        memset((void *)p_dest, 0,u_width);
         p_dest += u_stride_out;
-        M4OSA_memset((M4OSA_MemAddr8)p_destu, u_widthuv, 128);
-        M4OSA_memset((M4OSA_MemAddr8)p_destv, u_widthuv, 128);
+        memset((void *)p_destu, 128,u_widthuv);
+        memset((void *)p_destv, 128,u_widthuv);
         p_destu += u_stride_out_uv;
         p_destv += u_stride_out_uv;
     }
@@ -343,14 +343,14 @@ unsigned char M4VFL_applyClosingCurtain(M4ViComImagePlane *plane_in, M4ViComImag
     /* copy other lines from source */
     for (j = (u_height - nb_black_lines) >> 1; j != 0; j--)
     {
-        M4OSA_memcpy((M4OSA_MemAddr8)p_dest, (M4OSA_MemAddr8)p_src, u_width);
+        memcpy((void *)p_dest, (void *)p_src, u_width);
         p_dest += u_stride_out;
         p_src += u_stride;
-        M4OSA_memcpy((M4OSA_MemAddr8)p_dest,(M4OSA_MemAddr8) p_src, u_width);
+        memcpy((void *)p_dest,(void *) p_src, u_width);
         p_dest += u_stride_out;
         p_src += u_stride;
-        M4OSA_memcpy((M4OSA_MemAddr8)p_destu,(M4OSA_MemAddr8) p_srcu, u_widthuv);
-        M4OSA_memcpy((M4OSA_MemAddr8)p_destv, (M4OSA_MemAddr8)p_srcv, u_widthuv);
+        memcpy((void *)p_destu,(void *) p_srcu, u_widthuv);
+        memcpy((void *)p_destv, (void *)p_srcv, u_widthuv);
         p_destu += u_stride_out_uv;
         p_destv += u_stride_out_uv;
         p_srcu += u_stride_uv;
@@ -393,42 +393,32 @@ unsigned char M4VFL_applyOpeningCurtain(M4ViComImagePlane *plane_in,
 
     for (j = (u_height - nb_black_lines) >> 1; j != 0; j--)
     {
-        M4OSA_memset((M4OSA_MemAddr8)p_dest, u_width, 0);
+        memset((void *)p_dest, 0,u_width);
         p_dest += u_stride_out;
-        M4OSA_memset((M4OSA_MemAddr8)p_dest, u_width, 0);
+        memset((void *)p_dest,0, u_width);
         p_dest += u_stride_out;
-        M4OSA_memset((M4OSA_MemAddr8)p_destu, u_widthuv, 128);
-        M4OSA_memset((M4OSA_MemAddr8)p_destv, u_widthuv, 128);
+        memset((void *)p_destu, 128,u_widthuv);
+        memset((void *)p_destv, 128,u_widthuv);
         p_destu += u_stride_out_uv;
         p_destv += u_stride_out_uv;
     }
 
     for (j = (nb_black_lines >> 1); j != 0; j--)
     {
-        M4OSA_memcpy((M4OSA_MemAddr8)p_dest,(M4OSA_MemAddr8) p_src, u_width);
+        memcpy((void *)p_dest,(void *) p_src, u_width);
         p_dest += u_stride_out;
         p_src += u_stride;
-        M4OSA_memcpy((M4OSA_MemAddr8)p_dest,(M4OSA_MemAddr8) p_src, u_width);
+        memcpy((void *)p_dest,(void *) p_src, u_width);
         p_dest += u_stride_out;
         p_src += u_stride;
-        M4OSA_memcpy((M4OSA_MemAddr8)p_destu,(M4OSA_MemAddr8) p_srcu, u_widthuv);
-        M4OSA_memcpy((M4OSA_MemAddr8)p_destv, (M4OSA_MemAddr8)p_srcv, u_widthuv);
+        memcpy((void *)p_destu,(void *) p_srcu, u_widthuv);
+        memcpy((void *)p_destv, (void *)p_srcv, u_widthuv);
         p_destu += u_stride_out_uv;
         p_destv += u_stride_out_uv;
         p_srcu += u_stride_uv;
         p_srcv += u_stride_uv;
     }
 
-/*    p_destu = (unsigned char *) &plane_out[1].pac_data[plane_out[1].u_topleft];
-    p_destv = (unsigned char *) &plane_out[2].pac_data[plane_out[2].u_topleft];
-    for (j = (u_height >> 1); j != 0; j--)
-    {
-        M4OSA_memset(p_destu, u_widthuv, 128);
-        M4OSA_memset(p_destv, u_widthuv, 128);
-        p_destu += u_stride_out_uv;
-        p_destv += u_stride_out_uv;
-    }
-*/
     return 0;
 }
 
@@ -461,14 +451,14 @@ unsigned char M4VFL_applyFallingCurtain(M4ViComImagePlane *plane_in,
 
     for (j = (nb_black_lines >> 1); j != 0; j--)
     {
-        M4OSA_memcpy((M4OSA_MemAddr8)p_dest,(M4OSA_MemAddr8) p_src, u_width);
+        memcpy((void *)p_dest,(void *) p_src, u_width);
         p_dest += u_stride_out;
         p_src += u_stride;
-        M4OSA_memcpy((M4OSA_MemAddr8)p_dest,(M4OSA_MemAddr8) p_src, u_width);
+        memcpy((void *)p_dest,(void *) p_src, u_width);
         p_dest += u_stride_out;
         p_src += u_stride;
-        M4OSA_memcpy((M4OSA_MemAddr8)p_destu,(M4OSA_MemAddr8) p_srcu, u_widthuv);
-        M4OSA_memcpy((M4OSA_MemAddr8)p_destv,(M4OSA_MemAddr8) p_srcv, u_widthuv);
+        memcpy((void *)p_destu,(void *) p_srcu, u_widthuv);
+        memcpy((void *)p_destv,(void *) p_srcv, u_widthuv);
         p_destu += u_stride_out_uv;
         p_destv += u_stride_out_uv;
         p_srcu += u_stride_uv;
@@ -477,12 +467,12 @@ unsigned char M4VFL_applyFallingCurtain(M4ViComImagePlane *plane_in,
 
     for (j = (u_height - nb_black_lines) >> 1; j != 0; j--)
     {
-        M4OSA_memset((M4OSA_MemAddr8)p_dest, u_width, 0);
+        memset((void *)p_dest, 0,u_width);
         p_dest += u_stride_out;
-        M4OSA_memset((M4OSA_MemAddr8)p_dest, u_width, 0);
+        memset((void *)p_dest, 0,u_width);
         p_dest += u_stride_out;
-        M4OSA_memset((M4OSA_MemAddr8)p_destu, u_widthuv, 128);
-        M4OSA_memset((M4OSA_MemAddr8)p_destv, u_widthuv, 128);
+        memset((void *)p_destu, 128,u_widthuv);
+        memset((void *)p_destv, 128,u_widthuv);
         p_destu += u_stride_out_uv;
         p_destv += u_stride_out_uv;
     }
@@ -541,12 +531,12 @@ unsigned char M4VFL_applyCurtain(M4ViComImagePlane *plane_in, M4ViComImagePlane
         /* write black lines */
         for (j = (nb_black_lines >> 1); j != 0; j--)
         {
-            M4OSA_memset((M4OSA_MemAddr8)p_dest, u_width, 0);
+            memset((void *)p_dest, 0,u_width);
             p_dest += u_stride_out;
-            M4OSA_memset((M4OSA_MemAddr8)p_dest, u_width, 0);
+            memset((void *)p_dest, 0,u_width);
             p_dest += u_stride_out;
-            M4OSA_memset((M4OSA_MemAddr8)p_destu, u_widthuv, 128);
-            M4OSA_memset((M4OSA_MemAddr8)p_destv, u_widthuv, 128);
+            memset((void *)p_destu, 128,u_widthuv);
+            memset((void *)p_destv, 128,u_widthuv);
             p_destu += u_stride_out_uv;
             p_destv += u_stride_out_uv;
         }
@@ -554,14 +544,14 @@ unsigned char M4VFL_applyCurtain(M4ViComImagePlane *plane_in, M4ViComImagePlane
         /* copy from source image */
         for (j = (u_height - nb_black_lines) >> 1; j != 0; j--)
         {
-            M4OSA_memcpy((M4OSA_MemAddr8)p_dest, (M4OSA_MemAddr8)p_src, u_width);
+            memcpy((void *)p_dest, (void *)p_src, u_width);
             p_dest += u_stride_out;
             p_src += u_stride;
-            M4OSA_memcpy((M4OSA_MemAddr8)p_dest,(M4OSA_MemAddr8) p_src, u_width);
+            memcpy((void *)p_dest,(void *) p_src, u_width);
             p_dest += u_stride_out;
             p_src += u_stride;
-            M4OSA_memcpy((M4OSA_MemAddr8)p_destu,(M4OSA_MemAddr8) p_srcu, u_widthuv);
-            M4OSA_memcpy((M4OSA_MemAddr8)p_destv, (M4OSA_MemAddr8)p_srcv, u_widthuv);
+            memcpy((void *)p_destu,(void *) p_srcu, u_widthuv);
+            memcpy((void *)p_destv, (void *)p_srcv, u_widthuv);
             p_destu += u_stride_out_uv;
             p_destv += u_stride_out_uv;
             p_srcu += u_stride_uv;
@@ -578,14 +568,14 @@ unsigned char M4VFL_applyCurtain(M4ViComImagePlane *plane_in, M4ViComImagePlane
         /* copy from source image image */
         for (j = (nb_black_lines >> 1); j != 0; j--)
         {
-            M4OSA_memcpy((M4OSA_MemAddr8)p_dest, (M4OSA_MemAddr8)p_src, u_width);
+            memcpy((void *)p_dest, (void *)p_src, u_width);
             p_dest += u_stride_out;
             p_src += u_stride;
-            M4OSA_memcpy((M4OSA_MemAddr8)p_dest,(M4OSA_MemAddr8) p_src, u_width);
+            memcpy((void *)p_dest,(void *) p_src, u_width);
             p_dest += u_stride_out;
             p_src += u_stride;
-            M4OSA_memcpy((M4OSA_MemAddr8)p_destu,(M4OSA_MemAddr8) p_srcu, u_widthuv);
-            M4OSA_memcpy((M4OSA_MemAddr8)p_destv,(M4OSA_MemAddr8) p_srcv, u_widthuv);
+            memcpy((void *)p_destu,(void *) p_srcu, u_widthuv);
+            memcpy((void *)p_destv,(void *) p_srcv, u_widthuv);
             p_destu += u_stride_out_uv;
             p_destv += u_stride_out_uv;
             p_srcu += u_stride_uv;
@@ -596,12 +586,12 @@ unsigned char M4VFL_applyCurtain(M4ViComImagePlane *plane_in, M4ViComImagePlane
         /* the pointers to p_dest, p_destu and p_destv are used through the two loops "for" */
         for (j = (u_height - nb_black_lines) >> 1; j != 0; j--)
         {
-            M4OSA_memset((M4OSA_MemAddr8)p_dest, u_width, 0);
+            memset((void *)p_dest, 0,u_width);
             p_dest += u_stride_out;
-            M4OSA_memset((M4OSA_MemAddr8)p_dest, u_width, 0);
+            memset((void *)p_dest, 0,u_width);
             p_dest += u_stride_out;
-            M4OSA_memset((M4OSA_MemAddr8)p_destu, u_widthuv, 128);
-            M4OSA_memset((M4OSA_MemAddr8)p_destv, u_widthuv, 128);
+            memset((void *)p_destu, 128,u_widthuv);
+            memset((void *)p_destv, 128,u_widthuv);
             p_destu += u_stride_out_uv;
             p_destv += u_stride_out_uv;
         }