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

Commit 381f4754 authored by Dirk Dougherty's avatar Dirk Dougherty
Browse files

resolved conflicts for merge of 532679a5 to master 

Change-Id: Id60d047c0e1f288acff97526c016cca632873b6b
parents b279312a 6a26abba

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

+1 −1
Original line number Diff line number Diff line
@@ -1041,7 +1041,7 @@ PV_STATUS DecodeShortHeader(VideoDecData *video, Vop *currVop) 
    /* Marker Bit */

    if (!BitstreamRead1Bits(stream))

    {

        mp4dec_log("DecodeShortHeader(): Market bit wrong.\n");

        mp4dec_log("DecodeShortHeader(): Marker bit wrong.\n");

        status = PV_FAIL;

        goto return_point;

    }