diff options
| author | Marco Nelissen <marcone@google.com> | 2013-03-28 09:18:59 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-28 09:18:59 -0700 |
| commit | 49a8b409541eb090bf31761014d3bc9bd64b77bd (patch) | |
| tree | 97f50112caa814e7323d4571e7e7ef4066df9500 | |
| parent | 425340a1fcb42c87f7f67b87214a500dbb517aad (diff) | |
| parent | 5952255a0259882cc32ee6e98018ced679303724 (diff) | |
| download | frameworks_av-49a8b409541eb090bf31761014d3bc9bd64b77bd.zip frameworks_av-49a8b409541eb090bf31761014d3bc9bd64b77bd.tar.gz frameworks_av-49a8b409541eb090bf31761014d3bc9bd64b77bd.tar.bz2 | |
am 5952255a: Merge "Fix valgrind error in software h264 decoder" into jb-mr2-dev
* commit '5952255a0259882cc32ee6e98018ced679303724':
Fix valgrind error in software h264 decoder
| -rwxr-xr-x | media/libstagefright/codecs/on2/h264dec/source/h264bsd_util.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/media/libstagefright/codecs/on2/h264dec/source/h264bsd_util.c b/media/libstagefright/codecs/on2/h264dec/source/h264bsd_util.c index 53b2fd8..cc838fd 100755 --- a/media/libstagefright/codecs/on2/h264dec/source/h264bsd_util.c +++ b/media/libstagefright/codecs/on2/h264dec/source/h264bsd_util.c @@ -220,7 +220,7 @@ u32 h264bsdNextMbAddress(u32 *pSliceGroupMap, u32 picSizeInMbs, u32 currMbAddr) /* Variables */ - u32 i, sliceGroup, tmp; + u32 i, sliceGroup; /* Code */ @@ -231,11 +231,9 @@ u32 h264bsdNextMbAddress(u32 *pSliceGroupMap, u32 picSizeInMbs, u32 currMbAddr) sliceGroup = pSliceGroupMap[currMbAddr]; i = currMbAddr + 1; - tmp = pSliceGroupMap[i]; - while ((i < picSizeInMbs) && (tmp != sliceGroup)) + while ((i < picSizeInMbs) && (pSliceGroupMap[i] != sliceGroup)) { i++; - tmp = pSliceGroupMap[i]; } if (i == picSizeInMbs) |