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

Commit ed1abbfc 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 

am: 4b0f2f51

Change-Id: Ic5ff05b44bcfe9edefff1044c78691d3fd6c9f98
parents 89a50551 4b0f2f51

media/libstagefright/DataSource.cpp

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

        }





        String8 cacheConfig;

        String8 cacheConfig;

        bool disconnectAtHighwatermark;

        bool disconnectAtHighwatermark = false;

        KeyedVector<String8, String8> nonCacheSpecificHeaders;

        KeyedVector<String8, String8> nonCacheSpecificHeaders;

        if (headers != NULL) {

        if (headers != NULL) {

            nonCacheSpecificHeaders = *headers;

            nonCacheSpecificHeaders = *headers;

media/libstagefright/MPEG4Extractor.cpp

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

        // fall through

    }

    }





    off64_t offset;

    off64_t offset = 0;

    size_t size;

    size_t size = 0;

    uint32_t cts, stts;

    uint32_t cts, stts;

    bool isSyncSample;

    bool isSyncSample;

    bool newBuffer = false;

    bool newBuffer = false;