summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorPhil Burk <philburk@google.com>2014-09-09 22:03:13 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-09-09 22:03:13 +0000
commit47a13d45ae3f05ddb778124484a17d4754c82b7a (patch)
tree976eff24183b4a3b0b8fefd58bb20337ef359776 /media
parent95861b33c7dcfa450f5e10568c0767b07bc50729 (diff)
parentcbe165a6f68c90bbdd2b1593387d4072bd80b924 (diff)
downloadframeworks_av-47a13d45ae3f05ddb778124484a17d4754c82b7a.zip
frameworks_av-47a13d45ae3f05ddb778124484a17d4754c82b7a.tar.gz
frameworks_av-47a13d45ae3f05ddb778124484a17d4754c82b7a.tar.bz2
Merge "[media][nuplayer] Remove debug message EWOULDBLOCK" into lmp-dev
Diffstat (limited to 'media')
-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 {