commit 545af523aee3d95a4438d44f97a0744c6cbf819c
author Chih-hung Hsieh <chh@google.com> Mon Oct 15 11:16:18 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon Oct 15 11:16:18 2018 -0700
tree b5a9f012e5ad35c9c48e3c5dbfcabad877e18587
parent 7db171bf8d532cd473ce90de68817c0d3a88af54
parent 67bf08f56cfeeb45d1ec82536c6c6cfd53c74331

Merge "Suppress implicit fallthrough warnings." am: 225f99219c
am: 67bf08f56c

Change-Id: I524178fd45053a38090baa83c4597d41c986b0b8

media/libstagefright/rtsp/MyHandler.h

diff --git a/media/libstagefright/rtsp/MyHandler.h b/media/libstagefright/rtsp/MyHandler.h
index c6c0245..d183516 100644
--- a/media/libstagefright/rtsp/MyHandler.h
+++ b/media/libstagefright/rtsp/MyHandler.h
@@ -54,6 +54,10 @@
 #define UNUSED_UNLESS_VERBOSE(x)
 #endif
 
+#ifndef FALLTHROUGH_INTENDED
+#define FALLTHROUGH_INTENDED [[clang::fallthrough]]  // NOLINT
+#endif
+
 // If no access units are received within 5 secs, assume that the rtp
 // stream has ended and signal end of stream.
 static int64_t kAccessUnitTimeoutUs = 10000000ll;
@@ -306,8 +310,10 @@
             switch (count) {
                 case 3:
                     data[offset++] = 0;
+                    FALLTHROUGH_INTENDED;
                 case 2:
                     data[offset++] = 0;
+                    FALLTHROUGH_INTENDED;
                 case 1:
                     data[offset++] = 0;
             }