Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5952255a authored by Marco Nelissen's avatar Marco Nelissen Committed by Android (Google) Code Review
Browse files

Merge "Fix valgrind error in software h264 decoder" into jb-mr2-dev

parents 636a5bd6 4a7fe9cd

media/libstagefright/codecs/on2/h264dec/source/h264bsd_util.c

+2 −4
Original line number Diff line number Diff line
@@ -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)