diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-04-04 14:47:28 -0700 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2014-04-15 13:18:22 -0700 |
| commit | db43b34c3428e480f8c4c66e7e88f4001f37f91e (patch) | |
| tree | be194bf06c84b61f277a1c29c7499aa7862494a4 /libvideoeditor/vss/src/M4xVSS_internal.c | |
| parent | 1df2557ac95a6d8a087fb15f6f842dc049f2759b (diff) | |
| download | frameworks_av-db43b34c3428e480f8c4c66e7e88f4001f37f91e.zip frameworks_av-db43b34c3428e480f8c4c66e7e88f4001f37f91e.tar.gz frameworks_av-db43b34c3428e480f8c4c66e7e88f4001f37f91e.tar.bz2 | |
media: 64 bit compile issues
- change internal sized types to use stdint.h
- printf & scanf formats
- size_t or unsigned int for iterators
Change-Id: Id993a70d8bf54c667c5d652b34179a2c727ed446
Diffstat (limited to 'libvideoeditor/vss/src/M4xVSS_internal.c')
| -rwxr-xr-x | libvideoeditor/vss/src/M4xVSS_internal.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libvideoeditor/vss/src/M4xVSS_internal.c b/libvideoeditor/vss/src/M4xVSS_internal.c index 64a6f40..84959ec 100755 --- a/libvideoeditor/vss/src/M4xVSS_internal.c +++ b/libvideoeditor/vss/src/M4xVSS_internal.c @@ -4156,12 +4156,12 @@ M4OSA_ERR M4VSS3GPP_externalVideoEffectZoom( M4VIFI_ImagePlane boxPlane[3]; - if(M4xVSS_kVideoEffectType_ZoomOut == (M4OSA_UInt32)pFunctionContext) + if((M4OSA_Void *)M4xVSS_kVideoEffectType_ZoomOut == pFunctionContext) { //ratio = 16 - (15 * pProgress->uiProgress)/1000; ratio = 16 - pProgress->uiProgress / 66 ; } - else if(M4xVSS_kVideoEffectType_ZoomIn == (M4OSA_UInt32)pFunctionContext) + else if((M4OSA_Void *)M4xVSS_kVideoEffectType_ZoomIn == pFunctionContext) { //ratio = 1 + (15 * pProgress->uiProgress)/1000; ratio = 1 + pProgress->uiProgress / 66 ; |