[vlc-commits] demux: don't map M3U to m3u8 extension (fix #15056)

2015-10-21 Thread Francois Cartegnie
vlc/vlc-2.2 | branch: master | Francois Cartegnie  | Fri Jul 
17 12:07:33 2015 +0200| [9e493c8ea4653e66c3d234da9e49e6ce4fba42cf] | committer: 
Jean-Baptiste Kempf

demux: don't map M3U to m3u8 extension (fix #15056)

Can't tell if that's m3u8 or hls without probing. Thanks Apple.

(cherry picked from commit b6afe6b4bb23889a6db8bd03e55629e609ac4270)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=9e493c8ea4653e66c3d234da9e49e6ce4fba42cf
---

 src/input/demux.c |1 -
 1 file changed, 1 deletion(-)

diff --git a/src/input/demux.c b/src/input/demux.c
index a0095ab..43f088b 100644
--- a/src/input/demux.c
+++ b/src/input/demux.c
@@ -113,7 +113,6 @@ demux_t *demux_New( vlc_object_t *p_obj, input_thread_t 
*p_parent_input,
 { "dv",   "dv" },
 { "drc",  "dirac" },
 { "m3u",  "m3u" },
-{ "m3u8", "m3u8" },
 { "mkv",  "mkv" }, { "mka",  "mkv" }, { "mks",  "mkv" },
 { "mp4",  "mp4" }, { "m4a",  "mp4" }, { "mov",  "mp4" }, { "moov", 
"mp4" },
 { "nsv",  "nsv" },

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits


[vlc-commits] demux: don't map M3U to m3u8 extension (fix #15056)

2015-07-17 Thread Francois Cartegnie
vlc | branch: master | Francois Cartegnie fcvlc...@free.fr | Fri Jul 17 
12:07:33 2015 +0200| [b6afe6b4bb23889a6db8bd03e55629e609ac4270] | committer: 
Francois Cartegnie

demux: don't map M3U to m3u8 extension (fix #15056)

Can't tell if that's m3u8 or hls without probing. Thanks Apple.

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

 src/input/demux.c |1 -
 1 file changed, 1 deletion(-)

diff --git a/src/input/demux.c b/src/input/demux.c
index ff5c1ba..bcbe9b5 100644
--- a/src/input/demux.c
+++ b/src/input/demux.c
@@ -113,7 +113,6 @@ demux_t *demux_New( vlc_object_t *p_obj, input_thread_t 
*p_parent_input,
 { dv,   dv },
 { drc,  dirac },
 { m3u,  m3u },
-{ m3u8, m3u8 },
 { mkv,  mkv }, { mka,  mkv }, { mks,  mkv },
 { mp4,  mp4 }, { m4a,  mp4 }, { mov,  mp4 }, { moov, 
mp4 },
 { nsv,  nsv },

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits