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

Commit 8ee1644e authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by android-build-merger
Browse files

Merge "Suppress implicit fallthrough warnings." am: 1ef73503 am: 20051364 

am: 7d4060b7

Change-Id: I6b92f92beaf3ed1271446a1f04a234d00543bd60
parents 262a5426 7d4060b7

media/libstagefright/codecs/amrwb/src/dec_acelp_4p_in_64.cpp

+1 −0
Original line number Diff line number Diff line
@@ -234,6 +234,7 @@ void dec_acelp_4p_in_64( 
                dec_6p_6N_2(L_index, 4, 0, pos);

                add_pulses(pos, 6, k, code);

            }

            break;

        default:

            break;

    }

media/libstagefright/codecs/amrwb/src/normalize_amr_wb.cpp

+1 −0
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ int16 normalize_amr_wb(int32 x) 
        case 0x38000000:

        case 0x30000000:

            i++;

            break;



        default:

            ;

media/libstagefright/codecs/mp3dec/src/pvmp3_normalize.cpp

+1 −0
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ int32 pvmp3_normalize(int32 x) 
        case 0x38000000:

        case 0x30000000:

            i++;

            break;



        default:

            ;

media/libstagefright/rtsp/ARTPWriter.cpp

+2 −0
Original line number Diff line number Diff line
@@ -400,8 +400,10 @@ void ARTPWriter::addSDES(const sp<ABuffer> &buffer) { 
        switch (count) {

            case 3:

                data[offset++] = 0;

                [[fallthrough]];

            case 2:

                data[offset++] = 0;

                [[fallthrough]];

            case 1:

                data[offset++] = 0;

        }