[vlc-commits] Revert "metachannels: force the use of the ffmpeg demuxer for mp4 ( extension .m4v here)."

[Pierre Ynard]

vlc | branch: master | Pierre Ynard <linkfanel at yahoo.fr> | Tue Mar  8 00:25:18 2011 +0100| [55909b0497805732e0851a1bee15d1d597dd1e98] | committer: Pierre Ynard

Revert "metachannels: force the use of the ffmpeg demuxer for mp4 (extension .m4v here)."

This reverts commit 11f64a071b31063915e035d0d3a8d6076ebadf2f.
Not needed anymore

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

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

 share/lua/playlist/metachannels.lua |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/share/lua/playlist/metachannels.lua b/share/lua/playlist/metachannels.lua
index 6c1c3a4..2e2b7d6 100644
--- a/share/lua/playlist/metachannels.lua
+++ b/share/lua/playlist/metachannels.lua
@@ -28,8 +28,6 @@ end
 
 function parse()
     local webpage = ''
-    local options
-
     while true do
         local line = vlc.readline()
         if line == nil then break end
@@ -45,12 +43,10 @@ function parse()
         if( item.name == 'item' ) then
             simplexml.add_name_maps( item )
             local url = string.gsub( item.children_map['link'][1].children[1], '&', '&' )
-            if( string.match( url, '%.m4v' ) ) then options = { ':play-and-pause', ':demux=avformat,ffmpeg' }
-                                               else options = { ':play-and-pause' } end
             table.insert( tracks, { path = url,
                                     title = item.children_map['title'][1].children[1],
                                     arturl = item.children_map['media:thumbnail'][1].attributes['url'],
-                                    options = options } )
+                                    options = {':play-and-pause'} } )
         end
     end