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

Commit 94afc302 authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh Committed by android-build-merger
Browse files

Merge "Suppress implicit-fallthrough warnings in mpeg2." am: e22f0ebe am: 06a5fade 

am: a2f4d121

Change-Id: Ia0c2690c8cc040ffe377fa680c87fbdbdc56611e
parents 22efef58 a2f4d121

media/extractors/mpeg2/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -25,6 +25,10 @@ cc_library_shared { 
        "libstagefright_foundation",

    ],



    header_libs: [

        "libbase_headers",

    ],



    static_libs: [

        "libstagefright_mpeg2support",

        "libutils",

media/extractors/mpeg2/MPEG2TSExtractor.cpp

+3 −1
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 
#include <inttypes.h>

#include <utils/Log.h>



#include <android-base/macros.h>



#include "MPEG2TSExtractor.h"



#include <media/DataSourceBase.h>
@@ -512,7 +514,7 @@ status_t MPEG2TSExtractor::seek(int64_t seekTimeUs, 
        case MediaTrack::ReadOptions::SEEK_CLOSEST:

            ALOGW("seekMode not supported: %d; falling back to PREVIOUS_SYNC",

                    seekMode);

            // fall-through

            FALLTHROUGH_INTENDED;

        case MediaTrack::ReadOptions::SEEK_PREVIOUS_SYNC:

            if (index == 0) {

                ALOGW("Previous sync not found; starting from the earliest "