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

Commit 567ad5c6 authored by Marco Nelissen's avatar Marco Nelissen Committed by Android Git Automerger
Browse files

am 7ce82583: am 13b6b51e: am f7d1f627: am 257b3bc5: Don\'t crash when there\'s no conceal frame 

* commit '7ce82583':
  Don't crash when there's no conceal frame
parents 0e86f9f1 7ce82583

media/libstagefright/codecs/m4v_h263/dec/src/conceal.cpp

+5 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include "vlc_decode.h"

#include "bitstream.h"

#include "scaling.h"

#include "log/log.h"



/* ====================================================================== /

Function : ConcealTexture_I()
@@ -137,6 +138,10 @@ Modified: 6/04/2001 rewrote the function 
****************************************************************************/

void CopyVopMB(Vop *curr, uint8 *prevFrame, int mbnum, int width_Y, int height)

{

    if (curr == NULL || prevFrame == NULL) {

        ALOGE("b/24630158");

        return;

    }

    int width_C = width_Y >> 1;

    int row = MB_SIZE;

    uint8              *y1, *y2, *u1, *u2, *v1, *v2;