Merge branch 'master' into master

Author: theScrabi

extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java

@@ -386,11 +386,16 @@ public String getDashMpdUrl() throws ParsingException {
     public String getHlsUrl() throws ParsingException {
         assertPageFetched();
         try {
-            String hlsvp;
-            if (playerArgs != null && playerArgs.isString("hlsvp")) {
-                hlsvp = playerArgs.getString("hlsvp", "");
-            } else {
-                return "";
+            String hlsvp = "";
+            if (playerArgs != null) {
+                if( playerArgs.isString("hlsvp") ) {
+                    hlsvp = playerArgs.getString("hlsvp", "");
+                }else {
+                    hlsvp = JsonParser.object()
+                            .from(playerArgs.getString("player_response", "{}"))
+                            .getObject("streamingData", new JsonObject())
+                            .getString("hlsManifestUrl", "");
+                }
             }
 
             return hlsvp;