summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/ACodec.cpp
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2014-03-07 02:41:37 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-07 02:41:37 +0000
commit414c2371ab38a9826dca2506c9cefd703af05c2b (patch)
tree706d56faf49d906492078245bd4a7e247a1cfd5c /media/libstagefright/ACodec.cpp
parent6fefae269ca96af5ebeef0aa6e67932ff5f7a1a0 (diff)
parent4dbd814de3a3bc95ca3fe39be2400418e7a05602 (diff)
downloadframeworks_av-414c2371ab38a9826dca2506c9cefd703af05c2b.zip
frameworks_av-414c2371ab38a9826dca2506c9cefd703af05c2b.tar.gz
frameworks_av-414c2371ab38a9826dca2506c9cefd703af05c2b.tar.bz2
am 4dbd814d: am 2338782d: Merge "Fixed misplaced bracket for switch-case block." into klp-dev
* commit '4dbd814de3a3bc95ca3fe39be2400418e7a05602': Fixed misplaced bracket for switch-case block.
Diffstat (limited to 'media/libstagefright/ACodec.cpp')
-rw-r--r--media/libstagefright/ACodec.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp
index c68dfc1..d7304e0 100644
--- a/media/libstagefright/ACodec.cpp
+++ b/media/libstagefright/ACodec.cpp
@@ -3318,11 +3318,11 @@ void ACodec::BaseState::onInputBufferFilled(const sp<AMessage> &msg) {
mCodec->mInputEOSResult = err;
}
break;
-
- default:
- CHECK_EQ((int)mode, (int)FREE_BUFFERS);
- break;
}
+
+ default:
+ CHECK_EQ((int)mode, (int)FREE_BUFFERS);
+ break;
}
}