Merge "Apparently the mp3 decoder glitches if it was configured with the wrong" into jb-mr2-dev
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;
}
diff --git a/media/libstagefright/httplive/M3UParser.cpp b/media/libstagefright/httplive/M3UParser.cpp
index 44e03dc..68bbca2 100644
--- a/media/libstagefright/httplive/M3UParser.cpp
+++ b/media/libstagefright/httplive/M3UParser.cpp
@@ -163,9 +163,6 @@
while (offsetLF < size && data[offsetLF] != '\n') {
++offsetLF;
}
- if (offsetLF >= size) {
- break;
- }
AString line;
if (offsetLF > offset && data[offsetLF - 1] == '\r') {