diff options
| author |   Eric Hameleers <alien@slackware.com> | 2011-08-14 20:45:30 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2011-08-14 20:45:30 +0000 |
| commit | 57dd5ee3aecd474c241c051889558c6f9a5c9c5b (patch) | |
| tree | db28fe22f69c7dcece2d700d1f1a05691748ad1c /vlc/build/vlc-1.1.11_youtube.patch | |
| parent | 816bc6d9a9b333d78f361078c3e0b328daf02662 (diff) | |
| download | asb-57dd5ee3aecd474c241c051889558c6f9a5c9c5b.tar.gz asb-57dd5ee3aecd474c241c051889558c6f9a5c9c5b.tar.xz | |
Forgot one of the earlier patches
Diffstat (limited to 'vlc/build/vlc-1.1.11_youtube.patch')
| -rw-r--r-- | vlc/build/vlc-1.1.11_youtube.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/vlc/build/vlc-1.1.11_youtube.patch b/vlc/build/vlc-1.1.11_youtube.patch index 38d31b78..edd9b3b0 100644 --- a/vlc/build/vlc-1.1.11_youtube.patch +++ b/vlc/build/vlc-1.1.11_youtube.patch @@ -23,6 +23,37 @@ index 85ba428..5d386eb 100644 _,_,base_yt_url = string.find( line, "\"BASE_YT_URL\": \"(.-)\"" ) end +# ========================================================================= + +From: Pierre Ynard <linkfanel@yahoo.fr> +Date: Thu, 4 Aug 2011 18:32:00 +0000 (+0200) +Subject: youtube.lua: avoid parsing a nil variable +X-Git-Url: http://git.videolan.org/?p=vlc%2Fvlc-1.1.git;a=commitdiff_plain;h=c77c2f1cacdef05c0c87b452da62e9a4748bd843 + +youtube.lua: avoid parsing a nil variable +(cherry picked from commit 90dfae907387cd136de35b1da4feab46d10a1a52) + +Signed-off-by: Pierre Ynard <linkfanel@yahoo.fr> +--- + +diff --git a/share/lua/playlist/youtube.lua b/share/lua/playlist/youtube.lua +index 5d386eb..62d8240 100644 +--- a/share/lua/playlist/youtube.lua ++++ b/share/lua/playlist/youtube.lua +@@ -88,9 +88,9 @@ function parse() + -- vlc.msg.err( t ) + -- video_id = string.gsub( line, ".*&video_id:'([^']*)'.*", "%1" ) + fmt_url_map = string.match( line, "\"fmt_url_map\": \"(.-)\"" ) +- -- FIXME: do this properly +- fmt_url_map = string.gsub( fmt_url_map, "\\u0026", "&" ) + 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 + -- Apparently formats are listed in quality order, + -- so we can afford to simply take the first one +# ========================================================================= + From: Pierre Ynard <linkfanel@yahoo.fr> Date: Fri, 5 Aug 2011 19:37:48 +0000 (+0200) Subject: youtube.lua: update to new website changes |