am 9fbe9429: Merge remote-tracking branch \'goog/jb-dev-mako\' into jb-mr1-dev
* commit '9fbe94294ce2053d102ff5de89846a0c5015fb58':
NuPlayer: Prevents creation of Video Decoder when we use Music Player
Synchronize access to OMX class member variables
Merge from jb-dev for "sample video corruption in MediaCodec mode." DO NOT MERGE
libstagefright: dynamically load libstagefright_chromium_http
Process EBD and FBD messages in ERROR state
Add vendor specific output color format
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
index daf60f6..3a976eb 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@ -497,8 +497,6 @@
}
}
} else if (what == Renderer::kWhatFlushComplete) {
- CHECK_EQ(what, (int32_t)Renderer::kWhatFlushComplete);
-
int32_t audio;
CHECK(msg->findInt32("audio", &audio));