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

Commit c1c6ce63 authored by Robert Shih's avatar Robert Shih Committed by android-build-merger
Browse files

Merge "httplive: live streaming initialization NULL check" into oc-dev am:... 

Merge "httplive: live streaming initialization NULL check" into oc-dev am: e4aa5e88 am: 0941ae73 am: a1147ece am: 7e821462
am: e4e3afa7

Change-Id: I407842388b7009068a4b9635dde9cec981294ace
parents 6cdeec05 e4e3afa7

media/libstagefright/httplive/PlaylistFetcher.cpp

+2 −1
Original line number Diff line number Diff line
@@ -1029,7 +1029,8 @@ void PlaylistFetcher::initSeqNumberForLiveStream( 
    sp<AMessage> itemMeta;

    int64_t itemDurationUs;

    int32_t targetDuration;

    if (mPlaylist->meta()->findInt32("target-duration", &targetDuration)) {

    if (mPlaylist->meta() != NULL

            && mPlaylist->meta()->findInt32("target-duration", &targetDuration)) {

        do {

            --index;

            if (!mPlaylist->itemAt(index, NULL /* uri */, &itemMeta)