Permalink
Browse files

Merge branch 'patch-1' of https://github.com/iking0980/jPlayer into i…

…king0980-patch-1
  • Loading branch information...
2 parents 377c4a8 + 526da54 commit e4a6c5db78fc940a3efad6834f18342be7eb0d34 @thepag thepag committed Nov 3, 2013
Showing with 15 additions and 3 deletions.
  1. +15 −3 actionscript/happyworm/jPlayer/JplayerRtmp.as
View
18 actionscript/happyworm/jPlayer/JplayerRtmp.as
@@ -512,7 +512,13 @@ package happyworm.jPlayer
{
appName = rtmpSrc.substring(endHost,rtmpSrc.indexOf("mp3:"));
streamFileName = rtmpSrc.substr(rtmpSrc.indexOf("mp3:"));
- streamFileName = streamFileName.substr(0,streamFileName.length - 4);
+ if ( streamFileName.indexOf("?") )
+ {
+ var tmp:String = streamFileName.substring(streamFileName.indexOf("?")) ;
+ streamFileName = streamFileName.substr(0,streamFileName.indexOf("?")) + encodeURI(tmp) ;
+ }
+ else
+ streamFileName = streamFileName.substr(0,streamFileName.length - 4);
}
// rtmp://cp83813.edgefcs.net/ondemand/rob_hall/bruce_campbell_oldspice.flv
@@ -521,7 +527,13 @@ package happyworm.jPlayer
{
appName = rtmpSrc.substring(endHost,rtmpSrc.indexOf("mp4:"));
streamFileName = rtmpSrc.substr(rtmpSrc.indexOf("mp4:"));
- streamFileName = streamFileName.substr(0,streamFileName.length - 4);
+ if ( streamFileName.indexOf("?") )
+ {
+ var tmpV:String = streamFileName.substring(streamFileName.indexOf("?")) ;
+ streamFileName = streamFileName.substr(0,streamFileName.indexOf("?")) + encodeURI(tmpV) ;
+ }
+ else
+ streamFileName = streamFileName.substr(0,streamFileName.length - 4);
}
// .f4v streams with standard appname/no instance name, .flv extension
@@ -980,4 +992,4 @@ package happyworm.jPlayer
}
}
}
-}
+}

0 comments on commit e4a6c5d

Please sign in to comment.