commit 8dd719e4374c009c86569180a9017bab339db37e
author Andreas Huber <andih@google.com> Wed Apr 17 19:52:41 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 17 19:52:41 2013 +0000
tree c41d2d2952241d32c8bd587f226bb7588db0c0dd
parent ed86384591c0bf7ee2d227a6c56e85aa54bfaeac
parent da9740e63a835e610519bd235be9137d74b6d409

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

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