summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2015-12-15 05:44:18 -0500
committerSteve Kondik <steve@cyngn.com>2015-12-15 05:45:43 -0500
commit093c8ed16d58b3095789a3d8a0f0923eb31b4af4 (patch)
tree8601dd27c162d13ae9c8b90a3420d414bba83cc5 /media/libmediaplayerservice
parentc571299e5c7ed97dc39a0f6aaaf40e5621bc37c4 (diff)
downloadframeworks_av-093c8ed16d58b3095789a3d8a0f0923eb31b4af4.zip
frameworks_av-093c8ed16d58b3095789a3d8a0f0923eb31b4af4.tar.gz
frameworks_av-093c8ed16d58b3095789a3d8a0f0923eb31b4af4.tar.bz2
nuplayer: Avoid crash when codec fails to load
* Remove unnecessary check condition. Change-Id: I3267a0c13165d74a2ea90333b42f000b51ace98b
Diffstat (limited to 'media/libmediaplayerservice')
-rw-r--r--media/libmediaplayerservice/nuplayer/NuPlayer.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
index c7e1b13..622e58a 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@ -1934,9 +1934,6 @@ void NuPlayer::performDecoderFlush(FlushCommand audio, FlushCommand video) {
void NuPlayer::performReset() {
ALOGV("performReset");
- CHECK(mAudioDecoder == NULL);
- CHECK(mVideoDecoder == NULL);
-
cancelPollDuration();
++mScanSourcesGeneration;