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

Commit 7e7a4e32 authored by Chad Brubaker's avatar Chad Brubaker
Browse files

resolved conflicts for merge of 3554658d to mnc-dev-plus-aosp 

Change-Id: I056eaf233868cd1b0173dfc7faa531503ca3c43e
parents 6ce3a998 3554658d

media/libstagefright/mpeg2ts/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ LOCAL_C_INCLUDES:= \ 


LOCAL_CFLAGS += -Werror -Wall

LOCAL_CLANG := true

LOCAL_SANITIZE := unsigned-integer-overflow



LOCAL_MODULE:= libstagefright_mpeg2ts

media/libstagefright/mpeg2ts/MPEG2PSExtractor.cpp

+2 −1
Original line number Diff line number Diff line
@@ -108,7 +108,8 @@ MPEG2PSExtractor::MPEG2PSExtractor(const sp<DataSource> &source) 
    }



    // Remove all tracks that were unable to determine their format.

    for (size_t i = mTracks.size(); i-- > 0;) {

    for (size_t i = mTracks.size(); i > 0;) {

        i--;

        if (mTracks.valueAt(i)->getFormat() == NULL) {

            mTracks.removeItemsAt(i);

        }