diff options
| author |   Eric Hameleers <alien@slackware.com> | 2011-08-14 16:44:33 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2011-08-14 16:44:33 +0000 |
| commit | 4a61cd7eca6b9b6adeb2effe7c5ffee14d1d0f75 (patch) | |
| tree | 896214ef8990976ab85b15415f0f743f2562c4e9 /vlc | |
| parent | 838fc3bdb1653c879ca4f9e73e6d9f6ab06a1cf3 (diff) | |
| download | asb-4a61cd7eca6b9b6adeb2effe7c5ffee14d1d0f75.tar.gz asb-4a61cd7eca6b9b6adeb2effe7c5ffee14d1d0f75.tar.xz | |
Add a second patch for the broken youtube playback
Diffstat (limited to 'vlc')
| -rw-r--r-- | vlc/build/vlc-1.1.11_youtube.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/vlc/build/vlc-1.1.11_youtube.patch b/vlc/build/vlc-1.1.11_youtube.patch index 03c5c615..38d31b78 100644 --- a/vlc/build/vlc-1.1.11_youtube.patch +++ b/vlc/build/vlc-1.1.11_youtube.patch @@ -22,3 +22,40 @@ index 85ba428..5d386eb 100644 if string.match( line, "BASE_YT_URL" ) then _,_,base_yt_url = string.find( line, "\"BASE_YT_URL\": \"(.-)\"" ) end + +From: Pierre Ynard <linkfanel@yahoo.fr> +Date: Fri, 5 Aug 2011 19:37:48 +0000 (+0200) +Subject: youtube.lua: update to new website changes +X-Git-Url: http://git.videolan.org/?p=vlc%2Fvlc-1.1.git;a=commitdiff_plain;h=9cb117783bb9dc4e361facf4d6da2378f07a759e + +youtube.lua: update to new website changes +(cherry picked from commit 7158aaea585c198a4e536af1be9f3cbbe2e62f74) + +Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr> +--- + +diff --git a/share/lua/playlist/youtube.lua b/share/lua/playlist/youtube.lua +index 62d8240..33c4a5c 100644 +--- a/share/lua/playlist/youtube.lua ++++ b/share/lua/playlist/youtube.lua +@@ -87,16 +87,15 @@ function parse() + _,_,t = string.find( line, "\"t\": \"(.-)\"" ) + -- vlc.msg.err( t ) + -- video_id = string.gsub( line, ".*&video_id:'([^']*)'.*", "%1" ) +- fmt_url_map = string.match( line, "\"fmt_url_map\": \"(.-)\"" ) ++ fmt_url_map = string.match( line, "\"url_encoded_fmt_stream_map\": \"(.-)\"" ) + if fmt_url_map then + -- FIXME: do this properly + fmt_url_map = string.gsub( fmt_url_map, "\\u0026", "&" ) +- for itag,url in string.gmatch( fmt_url_map, "(%d+)|([^,]+)" ) do ++ for url,itag in string.gmatch( fmt_url_map, "url=([^&,]+).-&itag=(%d+)" ) do + -- Apparently formats are listed in quality order, + -- so we can afford to simply take the first one + if not fmt or tonumber( itag ) == tonumber( fmt ) then +- -- do unescaping of / +- url = string.gsub( url, '\\/','/' ) ++ url = vlc.strings.decode_uri( url ) + path = url + break + end + |