commit da9740e63a835e610519bd235be9137d74b6d409
author Andreas Huber <andih@google.com> Tue Apr 16 10:54:03 2013 -0700
committer Andreas Huber <andih@google.com> Tue Apr 16 12:52:33 2013 -0700
tree db7e39018b0f9968994929ac178789b12d214854
parent f5c0211057be7a1d32f356d4162a84cce281394d

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

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::performDecoderFlush() {
     ALOGV("performDecoderFlush");
 
-    if (mAudioDecoder != NULL && mVideoDecoder == NULL) {
+    if (mAudioDecoder == NULL && mVideoDecoder == NULL) {
         return;
     }
 
@@ -1176,7 +1176,7 @@
 void NuPlayer::performDecoderShutdown() {
     ALOGV("performDecoderShutdown");
 
-    if (mAudioDecoder != NULL && mVideoDecoder == NULL) {
+    if (mAudioDecoder == NULL && mVideoDecoder == NULL) {
         return;
     }