From ca6867fbac7a69c4d7a253917ecf6d4abc18d49c Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Tue, 16 Apr 2013 10:54:03 -0700 Subject: Fix a typo that would cause us not to shutdown/flush the decoders in some cases. related-to-bug: 8630032 Change-Id: I8e94b53b34e137e827e9630c65f3252ea91e4ebd --- media/libmediaplayerservice/nuplayer/NuPlayer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'media/libmediaplayerservice/nuplayer') diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp index 46d0a5a..607ec6a 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp @@ -1158,7 +1158,7 @@ void NuPlayer::performSeek(int64_t seekTimeUs) { void NuPlayer::performDecoderFlush() { ALOGV("performDecoderFlush"); - if (mAudioDecoder != NULL && mVideoDecoder == NULL) { + if (mAudioDecoder == NULL && mVideoDecoder == NULL) { return; } @@ -1176,7 +1176,7 @@ void NuPlayer::performDecoderFlush() { void NuPlayer::performDecoderShutdown() { ALOGV("performDecoderShutdown"); - if (mAudioDecoder != NULL && mVideoDecoder == NULL) { + if (mAudioDecoder == NULL && mVideoDecoder == NULL) { return; } -- cgit v1.1