[vlc-commits] youtube.lua: don't force avformat demuxer

[Pierre Ynard]

vlc/vlc-1.1 | branch: master | Pierre Ynard <linkfanel at yahoo.fr> | Tue Mar  8 00:34:26 2011 +0100| [fa5fb6cc14a056e0d7a2e24d0e2a84660368c31a] | committer: Pierre Ynard

youtube.lua: don't force avformat demuxer

Not needed anymore
(cherry picked from commit cedbf7f3a7879caebca543ee0deab02ccdc81743)

Signed-off-by: Pierre Ynard <linkfanel at yahoo.fr>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=fa5fb6cc14a056e0d7a2e24d0e2a84660368c31a
---

 share/lua/playlist/youtube.lua |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/share/lua/playlist/youtube.lua b/share/lua/playlist/youtube.lua
index 56c4522..fd5be98 100644
--- a/share/lua/playlist/youtube.lua
+++ b/share/lua/playlist/youtube.lua
@@ -38,7 +38,6 @@ function probe()
     if vlc.access ~= "http" and vlc.access ~= "https" then
         return false
     end
-    options = {":demux=avformat,ffmpeg"}
     youtube_site = string.match( string.sub( vlc.path, 1, 8 ), "youtube" )
     if not youtube_site then
         -- FIXME we should be using a builtin list of known youtube websites
@@ -152,7 +151,7 @@ function parse()
                 path = "http://www.youtube.com/v/"..video_id
             end
         end
-        return { { path = path; name = name; description = description; artist = artist; arturl = arturl; options = options } }
+        return { { path = path; name = name; description = description; artist = artist; arturl = arturl } }
     else -- This is the flash player's URL
         if string.match( vlc.path, "title=" ) then
             name = vlc.strings.decode_uri(get_url_param( vlc.path, "title" ))
@@ -168,8 +167,8 @@ function parse()
         if not string.match( vlc.path, "t=" ) then
             -- This sucks, we're missing "t" which is now mandatory. Let's
             -- try using another url
-            return { { path = "http://www.youtube.com/v/"..video_id; name = name; arturl = arturl; options=options } }
+            return { { path = "http://www.youtube.com/v/"..video_id; name = name; arturl = arturl } }
         end
-        return { { path = "http://www.youtube.com/get_video.php?video_id="..video_id.."&t="..get_url_param( vlc.path, "t" )..format; name = name; arturl = arturl; options=options } }
+        return { { path = "http://www.youtube.com/get_video.php?video_id="..video_id.."&t="..get_url_param( vlc.path, "t" )..format; name = name; arturl = arturl } }
     end
 end