[vlc-devel] commit: Recognize .m3u8 extension ( Rémi Denis-Courmont )

[git version control]

vlc | branch: 1.0-bugfix | Rémi Denis-Courmont <remi at remlab.net> | Sat Dec  5 16:19:43 2009 +0200| [69423b362ebd48223ca1b80e2c569e3489e00e6d] | committer: Rémi Denis-Courmont 

Recognize .m3u8 extension

(cherry picked from commit 4c599fee36ab13203d54c6930ed4d2e775436f74)

Conflicts:

	include/vlc_interface.h

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

 include/vlc_interface.h |    2 +-
 src/input/demux.c       |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/vlc_interface.h b/include/vlc_interface.h
index 3b61d0a..8550c63 100644
--- a/include/vlc_interface.h
+++ b/include/vlc_interface.h
@@ -177,7 +177,7 @@ typedef enum vlc_dialog {
                          "*.ogg;*.ogm;*.ogv;*.ogx;*.ps;" \
                          "*.rec;*.rm;*.rmvb;*.tod;*.ts;*.vob;*.wmv"
 
-#define EXTENSIONS_PLAYLIST "*.asx;*.b4s;*.ifo;*.m3u;*.pls;*.ram;*.vlc;*.xspf"
+#define EXTENSIONS_PLAYLIST "*.asx;*.b4s;*.ifo;*.m3u;*.m3u8;*.pls;*.ram;*.vlc;*.xspf"
 
 #define EXTENSIONS_MEDIA EXTENSIONS_VIDEO ";" EXTENSIONS_AUDIO ";" \
                           EXTENSIONS_PLAYLIST
diff --git a/src/input/demux.c b/src/input/demux.c
index a6fe6d0..b939c10 100644
--- a/src/input/demux.c
+++ b/src/input/demux.c
@@ -99,7 +99,8 @@ demux_t *__demux_New( vlc_object_t *p_obj,
             { "flac", "flac" },
             { "dv",   "dv" },
             { "drc",  "dirac" },
-            { "m3u",  "playlist" },
+            { "m3u",  "m3u" },
+            { "m3u8", "m3u8" },
             { "mkv",  "mkv" }, { "mka",  "mkv" }, { "mks",  "mkv" },
             { "mp4",  "mp4" }, { "m4a",  "mp4" }, { "mov",  "mp4" }, { "moov", "mp4" },
             { "nsv",  "nsv" },