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

Commit a24ab5c9 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [6716922, 6716923, 6716413, 6717023, 6717024, 6716716,... 

Merge cherrypicks of [6716922, 6716923, 6716413, 6717023, 6717024, 6716716, 6715859, 6717160, 6717161, 6717162, 6717163, 6716295, 6717141, 6717181, 6717183, 6717184, 6717185, 6714937, 6717028, 6716717, 6716927, 6717200, 6717029, 6717030, 6717031, 6717032, 6717033, 6716928, 6717034, 6717035, 6716929, 6717201, 6716930, 6712377, 6712378, 6716643, 6717164, 6712379] into pi-qpr3-release

Change-Id: I8c4d6fee1f25241a504ee9e24ce039ab66253126
parents bdd6d24f ea5aa166

media/libstagefright/rtsp/APacketSource.cpp

+2 −2
Original line number Diff line number Diff line
@@ -376,8 +376,8 @@ static sp<ABuffer> MakeMPEG4VideoCodecSpecificData( 
    ALOGI("VOL dimensions = %dx%d", *width, *height);



    size_t len1 = config->size() + GetSizeWidth(config->size()) + 1;

    size_t len2 = len1 + GetSizeWidth(len1) + 1 + 13;

    size_t len3 = len2 + GetSizeWidth(len2) + 1 + 3;

    size_t len2 = len1 + GetSizeWidth(len1 + 13) + 1 + 13;

    size_t len3 = len2 + GetSizeWidth(len2 + 3) + 1 + 3;



    sp<ABuffer> csd = new ABuffer(len3);

    uint8_t *dst = csd->data();