diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2018-10-01 17:15:30 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-10-01 17:15:30 -0700 |
| commit | 87653da51febf0b3be01c742c5d2b6728b496ffa (patch) | |
| tree | 27df5d3d9cc3b23e65f3fd917e75e30c8dca1f89 /cmds | |
| parent | f441367a5fde9d08788797c4daccd717ce1a7609 (diff) | |
| parent | 35b30994727e48988274c6623c921a88634376cd (diff) | |
| download | frameworks_av-87653da51febf0b3be01c742c5d2b6728b496ffa.tar.gz frameworks_av-87653da51febf0b3be01c742c5d2b6728b496ffa.tar.bz2 frameworks_av-87653da51febf0b3be01c742c5d2b6728b496ffa.zip | |
Merge "Suppress implicit-fallthrough warnings in stagefright." am: 70f03120d7 am: fd38163d8b
am: 35b3099472
Change-Id: Ib35c96989eb80b612e2cd7a6a8798ed6db393ced
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/stagefright/codec.cpp | 4 | ||||
| -rw-r--r-- | cmds/stagefright/mediafilter.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cmds/stagefright/codec.cpp b/cmds/stagefright/codec.cpp index 6a58467d78..980d1d2c0b 100644 --- a/cmds/stagefright/codec.cpp +++ b/cmds/stagefright/codec.cpp @@ -366,13 +366,13 @@ int main(int argc, char **argv) { case 'T': { useTimestamp = true; + FALLTHROUGH_INTENDED; } - // fall through case 'R': { renderSurface = true; + FALLTHROUGH_INTENDED; } - // fall through case 'S': { useSurface = true; diff --git a/cmds/stagefright/mediafilter.cpp b/cmds/stagefright/mediafilter.cpp index f24d2ddd95..630de25999 100644 --- a/cmds/stagefright/mediafilter.cpp +++ b/cmds/stagefright/mediafilter.cpp @@ -706,13 +706,13 @@ int main(int argc, char **argv) { case 'T': { useTimestamp = true; + FALLTHROUGH_INTENDED; } - // fall through case 'R': { renderSurface = true; + FALLTHROUGH_INTENDED; } - // fall through case 'S': { useSurface = true; |