commit 38e28e87d2dc7966eef4db4ba48287427f0ea60d
author Andreas Huber <andih@google.com> Wed Apr 17 12:54:58 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Apr 17 12:54:58 2013 -0700
tree c41d2d2952241d32c8bd587f226bb7588db0c0dd
parent 7aebfe0eac988a5efa16d9268e4f3fe03d673e33
parent 8dd719e4374c009c86569180a9017bab339db37e

am 8dd719e4: Merge "Fix a typo that would cause us not to shutdown/flush the decoders in" into jb-mr2-dev

* commit '8dd719e4374c009c86569180a9017bab339db37e':
  Fix a typo that would cause us not to shutdown/flush the decoders in

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;
     }