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

Commit 4b0f2f51 authored by Caroline Tice's avatar Caroline Tice Committed by android-build-merger
Browse files

Merge "Fix static analyzer warnings" am: 9064b2d1 am: 9924503d 

am: 41194d93

Change-Id: I86f7ca87a54797027949c6d30afe8862f019f34e
parents 77a5123b 41194d93

media/libstagefright/DataSource.cpp

+1 −1
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ sp<DataSource> DataSource::CreateFromURI( 
        }



        String8 cacheConfig;

        bool disconnectAtHighwatermark;

        bool disconnectAtHighwatermark = false;

        KeyedVector<String8, String8> nonCacheSpecificHeaders;

        if (headers != NULL) {

            nonCacheSpecificHeaders = *headers;

media/libstagefright/MPEG4Extractor.cpp

+2 −2
Original line number Diff line number Diff line
@@ -4412,8 +4412,8 @@ status_t MPEG4Source::read( 
        // fall through

    }



    off64_t offset;

    size_t size;

    off64_t offset = 0;

    size_t size = 0;

    uint32_t cts, stts;

    bool isSyncSample;

    bool newBuffer = false;