diff options
| author | Andreas Huber <andih@google.com> | 2013-04-16 10:54:03 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2013-04-16 12:52:33 -0700 |
| commit | ca6867fbac7a69c4d7a253917ecf6d4abc18d49c (patch) | |
| tree | e52f4f2870cc4a0c58743000d88a10f410c5247f /media/libmediaplayerservice/nuplayer | |
| parent | 8461772f46769a384ea87b42848e2d77de529332 (diff) | |
| download | frameworks_av-ca6867fbac7a69c4d7a253917ecf6d4abc18d49c.zip frameworks_av-ca6867fbac7a69c4d7a253917ecf6d4abc18d49c.tar.gz frameworks_av-ca6867fbac7a69c4d7a253917ecf6d4abc18d49c.tar.bz2 | |
Fix a typo that would cause us not to shutdown/flush the decoders in
some cases.
related-to-bug: 8630032
Change-Id: I8e94b53b34e137e827e9630c65f3252ea91e4ebd
Diffstat (limited to 'media/libmediaplayerservice/nuplayer')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |