commit 53607243f11c4f36b0d966f71580f587e5fc2916
author Robert Shih <robertshih@google.com> Wed Jan 04 19:27:42 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 04 19:27:42 2017 +0000
tree d25777db8eb1b54df8a4982cc902c15fd82df846
parent d8086d5b2cc0a3b6cb20a57dbc3fbe560de4151b
parent ab438ff052e79a12a55517ee9b12bd1a9b6d0b24

Merge "HTTPLIVE: do not store hash of malformed M3U8 file" am: e8b14c3c5c am: f1d93381be
am: ab438ff052

Change-Id: I58d63bed58a007936f1f43e8f658106961d065c5

media/libstagefright/httplive/HTTPDownloader.cpp

diff --git a/media/libstagefright/httplive/HTTPDownloader.cpp b/media/libstagefright/httplive/HTTPDownloader.cpp
index 861b85a..793695a 100644
--- a/media/libstagefright/httplive/HTTPDownloader.cpp
+++ b/media/libstagefright/httplive/HTTPDownloader.cpp
@@ -256,10 +256,6 @@
 
         return NULL;
     }
-
-    if (curPlaylistHash != NULL) {
-        memcpy(curPlaylistHash, hash, sizeof(hash));
-    }
 #endif
 
     sp<M3UParser> playlist =
@@ -271,6 +267,13 @@
         return NULL;
     }
 
+#if defined(__ANDROID__)
+    if (curPlaylistHash != NULL) {
+
+        memcpy(curPlaylistHash, hash, sizeof(hash));
+    }
+#endif
+
     return playlist;
 }