Add .txd extension

But do not register it by default on Windows.

diff --git a/NEWS b/NEWS
index cbde1bc1e4774cb47e886cf7abaf9b8dcc5fb9ae..730b7c883f4d72850fcc2ce2b8ba4a1a90f3f8ac 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -43,7 +43,7 @@ Demuxer:
  * Support HDPR TS files
  * Improvements in metadata support in Ogg/Opus/Vorbis files
  * Fix encoding issues in some XML playlist formats
- * Support THP Wii/Gamecube files
+ * Support THP Wii/Gamecube, RenderWare video files
 
 Muxers:
  * Important rework of the Ogg muxer, notably for skeleton

diff --git a/include/vlc_interface.h b/include/vlc_interface.h
index 35e1412f0a5481a71cc3dc077f3b949708467df1..a947dbad162b46e59043e5490c6987a626605ee8 100644 (file)
--- a/include/vlc_interface.h
+++ b/include/vlc_interface.h
@@ -194,7 +194,7 @@ typedef enum vlc_dialog {
                              "mp2", "mp2v", "mp4", "mp4v", "mpe", "mpeg", "mpeg1", \
                              "mpeg2", "mpeg4", "mpg", "mpv2", "mts", "mtv", "mxf", "mxg", "nsv", "nuv", \
                              "ogg", "ogm", "ogv", "ogx", "ps", \
-                             "rec", "rm", "rmvb", "thp", "tod", "ts", "tts", "vob", "vro", \
+                             "rec", "rm", "rmvb", "thp", "tod", "ts", "tts", "txd", "vob", "vro", \
                              "webm", "wm", "wmv", "wtv", "xesc"
 
 #define EXTENSIONS_AUDIO \
@@ -256,7 +256,7 @@ typedef enum vlc_dialog {
                          "*.m2t;*.m2ts;*.m4v;*.mkv;*.mov;*.mp2;*.mp2v;*.mp4;*.mp4v;*.mpe;*.mpeg;*.mpeg1;" \
                          "*.mpeg2;*.mpeg4;*.mpg;*.mpv2;*.mts;*.mtv;*.mxf;*.mxg;*.nsv;*.nuv;" \
                          "*.ogg;*.ogm;*.ogv;*.ogx;*.ps;" \
-                         "*.rec;*.rm;*.rmvb;*.thp;*.tod;*.ts;*.tts;*.vob;*.vro;*.webm;*.wm;*.wmv;*.wtv;*.xesc"
+                         "*.rec;*.rm;*.rmvb;*.thp;*.tod;*.ts;*.tts;*.txd;*.vob;*.vro;*.webm;*.wm;*.wmv;*.wtv;*.xesc"
 
 #define EXTENSIONS_PLAYLIST "*.asx;*.b4s;*.cue;*.ifo;*.m3u;*.m3u8;*.pls;*.ram;*.rar;*.sdp;*.vlc;*.xspf;*.wax;*.wvx;*.zip;*.conf"
 

diff --git a/share/lua/http/js/common.js b/share/lua/http/js/common.js
index b09259c881fac524337c09fc0c042f092cd3137f..95440c5082f97afb1df29f17416c1df1eb7a820f 100644 (file)
--- a/share/lua/http/js/common.js
+++ b/share/lua/http/js/common.js
@@ -6,7 +6,7 @@ var video_types = [
            "mp2", "mp4", "mpeg", "mpeg1",
            "mpeg2", "mpeg4", "mpg", "mts", "mtv", "mxf", "mxg", "nuv",
            "ogg", "ogm", "ogv", "ogx", "ps",
-           "rec", "rm", "rmvb", "thp", "ts", "vob", "wmv", "xesc" ];
+           "rec", "rm", "rmvb", "thp", "ts", "txd", "vob", "wmv", "xesc" ];
 var audio_types = [
         "3ga", "a52", "aac", "ac3", "ape", "awb", "dts", "flac", "it",
         "m4a", "m4p", "mka", "mlp", "mod", "mp1", "mp2", "mp3",