summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Burk <philburk@google.com>2014-09-10 00:49:06 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-10 00:49:06 +0000
commitba8711db379fe243667a0387e2e86a49e17bee68 (patch)
treec251e8e9db044bd8abf02fedcc8a33ba4bef9cdc
parentcce5397d6896fcc30211c9aa2061d8c7d07d1a19 (diff)
parent47a13d45ae3f05ddb778124484a17d4754c82b7a (diff)
downloadframeworks_av-ba8711db379fe243667a0387e2e86a49e17bee68.zip
frameworks_av-ba8711db379fe243667a0387e2e86a49e17bee68.tar.gz
frameworks_av-ba8711db379fe243667a0387e2e86a49e17bee68.tar.bz2
am 47a13d45: Merge "[media][nuplayer] Remove debug message EWOULDBLOCK" into lmp-dev
* commit '47a13d45ae3f05ddb778124484a17d4754c82b7a': [media][nuplayer] Remove debug message EWOULDBLOCK
-rw-r--r--media/libmediaplayerservice/nuplayer/NuPlayer.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
index a44de98..4004ddf 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@ -1279,7 +1279,6 @@ status_t NuPlayer::feedDecoderInputData(bool audio, const sp<AMessage> &msg) {
}
if (err == -EWOULDBLOCK) {
- ALOGD("feedDecoderInputData() got EWOULDBLOCK");
if (biggerBuffer == NULL) {
return err;
} else {