[vlc-commits] Lua: Fix extreme.com playlist parser. They use http now.
Konstantin Pavlov
git at videolan.org
Thu Dec 1 11:56:40 CET 2011
vlc/vlc-1.2 | branch: master | Konstantin Pavlov <thresh at videolan.org> | Thu Dec 1 14:41:14 2011 +0400| [b2755006b6c5225a3f0f5cf1f1f97891f8e406a8] | committer: Konstantin Pavlov
Lua: Fix extreme.com playlist parser. They use http now.
> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=b2755006b6c5225a3f0f5cf1f1f97891f8e406a8
---
share/lua/playlist/extreme.lua | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/share/lua/playlist/extreme.lua b/share/lua/playlist/extreme.lua
index 5c7b2f6..6fd7251 100644
--- a/share/lua/playlist/extreme.lua
+++ b/share/lua/playlist/extreme.lua
@@ -72,12 +72,10 @@ function parse()
-- Try to find out if its a freecaster streaming or just a link to some
-- other video streaming website
- -- FIXME: I was unable to find any http-based freecaster streams,
- -- but I remember there were some a few months back.
- -- Right now we assume everything is streamed using RTMP, so we feed them to avio.
+ -- We assume freecaster now streams in http
if string.match( line, "<streams type=\"5\" server=\"(.*)\">" )
then
- _,_,rtmpserver = string.find( line, "<streams type=\"5\" server=\"(.*)\">" )
+ _,_,videoserver = string.find( line, "<streams type=\"5\" server=\"(.*)\">" )
gostraight = false
end
@@ -94,7 +92,7 @@ function parse()
_,_,height = string.find( line, "height=\"(%d+)\" duration" )
_,_,playpath = string.find( line, "\">(.*)</stream>" )
if ( prefres < 0 or tonumber( height ) <= prefres ) then
- path = "avio://" .. rtmpserver .. " playpath=" .. playpath
+ path = videoserver .. playpath
end
end
end
More information about the vlc-commits
mailing list