Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7e45e24 authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am 38e28e87: am 8dd719e4: Merge "Fix a typo that would cause us not to... 

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

* commit '38e28e87':
  Fix a typo that would cause us not to shutdown/flush the decoders in
parents bbf898c0 38e28e87

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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;

    }