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

Commit 02cf7d90 authored by Lajos Molnar's avatar Lajos Molnar Committed by android-build-merger
Browse files

Merge changes from topic "am-1e7935a2-3929-4000-bb19-9e0ff0e29216" into cw-f-dev 

am: ae2d8ccc

Change-Id: I476327926fbfc9cd8496198357698b5fafa684af
parents 050b6644 ae2d8ccc

media/libstagefright/SampleTable.cpp

+1 −2
Original line number Original line Diff line number Diff line
@@ -561,7 +561,7 @@ status_t SampleTable::setSyncSampleParams(off64_t data_offset, size_t data_size) 




    if (mDataSource->readAt(data_offset + 8, mSyncSamples,

    if (mDataSource->readAt(data_offset + 8, mSyncSamples,

            (size_t)allocSize) != (ssize_t)allocSize) {

            (size_t)allocSize) != (ssize_t)allocSize) {

        delete mSyncSamples;

        delete[] mSyncSamples;

        mSyncSamples = NULL;

        mSyncSamples = NULL;

        return ERROR_IO;

        return ERROR_IO;

    }

    }
@@ -987,4 +987,3 @@ int32_t SampleTable::getCompositionTimeOffset(uint32_t sampleIndex) { 
}

}





}  // namespace android
 
}  // namespace android