Add .caf file format

diff --git a/extras/package/win32/vlc.win32.nsi.in b/extras/package/win32/vlc.win32.nsi.in
index aca5f3d916a58af934939561016580901fc99a89..66f0f4001aec493088db90a26b394b6f472c03d4 100644 (file)
--- a/extras/package/win32/vlc.win32.nsi.in
+++ b/extras/package/win32/vlc.win32.nsi.in
@@ -270,6 +270,7 @@ FunctionEnd
   !insertmacro ${_action} ".amr"
   !insertmacro ${_action} ".aob"
   !insertmacro ${_action} ".ape"
+  !insertmacro ${_action} ".caf"
   !insertmacro ${_action} ".cda"
   !insertmacro ${_action} ".dts"
   !insertmacro ${_action} ".flac"

diff --git a/include/vlc_interface.h b/include/vlc_interface.h
index a55472832702ec1e2bdf5f6cd5b99e4999c9dc5a..55cebe696eb4d6c8c11564101eff9c45f16a5b73 100644 (file)
--- a/include/vlc_interface.h
+++ b/include/vlc_interface.h
@@ -123,7 +123,7 @@ VLC_API void libvlc_Quit( libvlc_int_t * );
          } \
          msg_Info( p_intf, "VLC media player - %s", VERSION_MESSAGE ); \
          msg_Info( p_intf, "%s", COPYRIGHT_MESSAGE ); \
-         msg_Info( p_intf, _("\nWarning: if you can't access the GUI " \
+         msg_Info( p_intf, _("\nWarning: if you cannot access the GUI " \
                              "anymore, open a command-line window, go to the " \
                              "directory where you installed VLC and run " \
                              "\"vlc -I qt\"\n") )
@@ -193,6 +193,7 @@ typedef enum vlc_dialog {
     "*.aob;" \
     "*.ape;" \
     "*.awb;" \
+    "*.caf;" \
     "*.cda;" \
     "*.dts;" \
     "*.flac;"\