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

Commit e5238893 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by Gerrit Code Review
Browse files

Merge "Fix aosp_arm64 mirror-aosp-master build 1119326"

parents a133bc87 4850983c

media/libstagefright/matroska/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ LOCAL_C_INCLUDES:= \ 
        $(TOP)/external/libvpx/libwebm \

        $(TOP)/frameworks/native/include/media/openmax \



LOCAL_CFLAGS += -Wno-multichar -Werror

LOCAL_CFLAGS += -Wno-multichar



LOCAL_MODULE:= libstagefright_matroska

media/libstagefright/matroska/MatroskaExtractor.cpp

+4 −4
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ MatroskaSource::MatroskaSource( 
        CHECK_GE(avccSize, 5u);



        mNALSizeLen = 1 + (avcc[4] & 3);

        ALOGV("mNALSizeLen = %d", mNALSizeLen);

        ALOGV("mNALSizeLen = %zu", mNALSizeLen);

    } else if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_AAC)) {

        mType = AAC;

    }
@@ -322,7 +322,7 @@ void BlockIterator::seek( 
    // Special case the 0 seek to avoid loading Cues when the application

    // extraneously seeks to 0 before playing.

    if (seekTimeNs <= 0) {

        ALOGV("Seek to beginning: %lld", seekTimeUs);

        ALOGV("Seek to beginning: %" PRId64, seekTimeUs);

        mCluster = pSegment->GetFirst();

        mBlockEntryIndex = 0;

        do {
@@ -331,7 +331,7 @@ void BlockIterator::seek( 
        return;

    }



    ALOGV("Seeking to: %lld", seekTimeUs);

    ALOGV("Seeking to: %" PRId64, seekTimeUs);



    // If the Cues have not been located then find them.

    const mkvparser::Cues* pCues = pSegment->GetCues();
@@ -380,7 +380,7 @@ void BlockIterator::seek( 
    for (size_t index = 0; index < pTracks->GetTracksCount(); ++index) {

        pTrack = pTracks->GetTrackByIndex(index);

        if (pTrack && pTrack->GetType() == 1) { // VIDEO_TRACK

            ALOGV("Video track located at %d", index);

            ALOGV("Video track located at %zu", index);

            break;

        }

    }

media/libstagefright/timedtext/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ LOCAL_SRC_FILES:= \ 
        TimedTextSRTSource.cpp    \

        TimedTextPlayer.cpp



LOCAL_CFLAGS += -Wno-multichar -Werror

LOCAL_CFLAGS += -Wno-multichar



LOCAL_C_INCLUDES:= \

        $(TOP)/frameworks/av/include/media/stagefright/timedtext \