diff options
| author | Martin Storsjo <martin@martin.st> | 2012-04-13 14:16:26 +0300 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-05-21 15:16:23 -0700 |
| commit | 4e1d7b8d16abbe8a60fa3957646297b552e82fb0 (patch) | |
| tree | 69c82e120bd3be7c3bc7e3c7ff874cd84cb654b9 /media/libstagefright/codecs/avc/common | |
| parent | 0c072553f20085b18e6204afc8818b7922bffa9d (diff) | |
| download | frameworks_av-4e1d7b8d16abbe8a60fa3957646297b552e82fb0.zip frameworks_av-4e1d7b8d16abbe8a60fa3957646297b552e82fb0.tar.gz frameworks_av-4e1d7b8d16abbe8a60fa3957646297b552e82fb0.tar.bz2 | |
stagefright avcenc: Switch tmp variables to use the right type, to avoid casting
This fixes building on platforms where int is smaller than
pointers, e.g. 64 bit platforms.
Change-Id: I3da0459bac10cbffd1db699bf4782fe926cd391f
Diffstat (limited to 'media/libstagefright/codecs/avc/common')
| -rw-r--r-- | media/libstagefright/codecs/avc/common/src/deblock.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/media/libstagefright/codecs/avc/common/src/deblock.cpp b/media/libstagefright/codecs/avc/common/src/deblock.cpp index 5ed4c82..de2d2b6 100644 --- a/media/libstagefright/codecs/avc/common/src/deblock.cpp +++ b/media/libstagefright/codecs/avc/common/src/deblock.cpp @@ -294,7 +294,8 @@ void DeblockMb(AVCCommonObj *video, int mb_x, int mb_y, uint8 *SrcY, uint8 *SrcU int filterLeftMbEdgeFlag = (mb_x != 0); int filterTopMbEdgeFlag = (mb_y != 0); int pitch = video->currPic->pitch; - int indexA, indexB, tmp; + int indexA, indexB; + int *tmp; int Alpha, Beta, Alpha_c, Beta_c; int mbNum = mb_y * video->PicWidthInMbs + mb_x; int *clipTable, *clipTable_c, *qp_clip_tab; @@ -386,7 +387,7 @@ void DeblockMb(AVCCommonObj *video, int mb_x, int mb_y, uint8 *SrcY, uint8 *SrcU /* Save Alpha, Beta and clipTable for future use, with the obselete variables filterLeftMbEdgeFlag, mbNum amd tmp */ filterLeftMbEdgeFlag = Alpha; mbNum = Beta; - tmp = (int)clipTable; + tmp = clipTable; indexA = MbQ->QPc + video->FilterOffsetA; indexB = MbQ->QPc + video->FilterOffsetB; @@ -486,7 +487,7 @@ void DeblockMb(AVCCommonObj *video, int mb_x, int mb_y, uint8 *SrcY, uint8 *SrcU /* Note that Alpha_c, Beta_c and clipTable_c for chroma is already calculated */ Alpha = filterLeftMbEdgeFlag; Beta = mbNum; - clipTable = (int *)tmp; + clipTable = tmp; GetStrength_HorizontalEdges(Strength + 4, MbQ); // Strength for 4 blks in 1 stripe, 0 => vertical edge |