vlc | branch: master | Jean-Baptiste Kempf <j...@videolan.org> | Fri Feb  7 
16:07:42 2014 +0100| [aa8cc70921a7b542f92a62084d81aa445a76232f] | committer: 
Jean-Baptiste Kempf

Add .bik extension registration

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

 extras/package/win32/NSIS/helpers/extensions.nsh |    1 +
 include/vlc_interface.h                          |    4 ++--
 share/lua/http/js/common.js                      |    2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/extras/package/win32/NSIS/helpers/extensions.nsh 
b/extras/package/win32/NSIS/helpers/extensions.nsh
index 108ca65..f12e688 100644
--- a/extras/package/win32/NSIS/helpers/extensions.nsh
+++ b/extras/package/win32/NSIS/helpers/extensions.nsh
@@ -158,6 +158,7 @@ FunctionEnd
   !insertmacro ${_action} Video ".amv"
   !insertmacro ${_action} Video ".asf"
   !insertmacro ${_action} Video ".avi"
+  !insertmacro ${_action} Video ".bik"
   !insertmacro ${_action} Video ".divx"
   !insertmacro ${_action} Video ".drc"
   !insertmacro ${_action} Video ".dv"
diff --git a/include/vlc_interface.h b/include/vlc_interface.h
index db78d33..c0e848c 100644
--- a/include/vlc_interface.h
+++ b/include/vlc_interface.h
@@ -188,7 +188,7 @@ typedef enum vlc_dialog {
                          "oga", "ogg", "oma", "opus", "qcp", "ra", "rmi", 
"s3m", "sid", "spx", "thd", "tta", \
                          "voc", "vqf", "w64", "wav", "wma", "wv", "xa", "xm"
 
-#define EXTENSIONS_VIDEO_CSV "3g2", "3gp", "3gp2", "3gpp", "amv", "asf", 
"avi", "divx", "drc", "dv", \
+#define EXTENSIONS_VIDEO_CSV "3g2", "3gp", "3gp2", "3gpp", "amv", "asf", 
"avi", "bik", "divx", "drc", "dv", \
                              "f4v", "flv", "gvi", "gxf", "iso", \
                              "m1v", "m2v", "m2t", "m2ts", "m4v", "mkv", "mov",\
                              "mp2", "mp2v", "mp4", "mp4v", "mpe", "mpeg", 
"mpeg1", \
@@ -252,7 +252,7 @@ typedef enum vlc_dialog {
     "*.xa;"  \
     "*.xm"
 
-#define EXTENSIONS_VIDEO 
"*.3g2;*.3gp;*.3gp2;*.3gpp;*.amv;*.asf;*.avi;*.bin;*.divx;*.drc;*.dv;*f4v;*.flv;*.gvi;*.gxf;*.iso;*.m1v;*.m2v;"
 \
+#define EXTENSIONS_VIDEO 
"*.3g2;*.3gp;*.3gp2;*.3gpp;*.amv;*.asf;*.avi;*.bik;*.bin;*.divx;*.drc;*.dv;*f4v;*.flv;*.gvi;*.gxf;*.iso;*.m1v;*.m2v;"
 \
                          
"*.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;" \
diff --git a/share/lua/http/js/common.js b/share/lua/http/js/common.js
index 02965d9..d766699 100644
--- a/share/lua/http/js/common.js
+++ b/share/lua/http/js/common.js
@@ -1,7 +1,7 @@
 var intv = 0;
 var ccmd = "";
 var video_types = [
-           "asf", "avi", "divx", "drc", "dv", "f4v", "flv", "gxf", "iso",
+           "asf", "avi", "bik", "bin", "divx", "drc", "dv", "f4v", "flv", 
"gxf", "iso",
            "m1v", "m2v", "m2t", "m2ts", "m4v", "mkv", "mov",
            "mp2", "mp4", "mpeg", "mpeg1",
            "mpeg2", "mpeg4", "mpg", "mts", "mtv", "mxf", "mxg", "nuv",

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

Reply via email to