Register CDXL, BMV, Ut Video, VBLE and Dxtory codecs in avcodec module.

[vlc] / include / vlc_configuration.h

diff --git a/include/vlc_configuration.h b/include/vlc_configuration.h
index 2284f1c27d9b64eb9b9433f4b5a415ba33661261..e01103bacefc993b4c1b11e1b7f3e98abc9cab88 100644 (file)
--- a/include/vlc_configuration.h
+++ b/include/vlc_configuration.h
@@ -1,26 +1,26 @@
 /*****************************************************************************
- * configuration.h : configuration management module
+ * vlc_configuration.h : configuration management module
  * This file describes the programming interface for the configuration module.
  * It includes functions allowing to declare, get or set configuration options.
  *****************************************************************************
- * Copyright (C) 1999-2006 the VideoLAN team
+ * Copyright (C) 1999-2006 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Gildas Bazin <gbazin@videolan.org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef VLC_CONFIGURATION_H
@@ -53,6 +53,7 @@ extern "C" {
 /* Configuration item types */
 #define CONFIG_ITEM_FLOAT                   0x20  /* Float option */
 #define CONFIG_ITEM_INTEGER                 0x40  /* Integer option */
+#define CONFIG_ITEM_RGB                     0x41  /* RGB color option */
 #define CONFIG_ITEM_BOOL                    0x60  /* Bool option */
 #define CONFIG_ITEM_STRING                  0x80  /* String option */
 #define CONFIG_ITEM_PASSWORD                0x81  /* Password option (*) */
@@ -171,7 +172,6 @@ struct module_config_t
     char          **ppsz_action_text;         /* Friendly names for actions */
 
     /* Deprecated */
-    char        *psz_oldname;                          /* Old option name */
     bool        b_removed;
 };
 
@@ -196,7 +196,7 @@ VLC_API void config_ResetAll( vlc_object_t * );
 VLC_API module_config_t * config_FindConfig( vlc_object_t *, const char * ) VLC_USED;
 VLC_API char * config_GetDataDir( vlc_object_t * ) VLC_USED VLC_MALLOC;
 #define config_GetDataDir(a) config_GetDataDir(VLC_OBJECT(a))
-VLC_API const char * config_GetLibDir( void ) VLC_USED;
+VLC_API char *config_GetLibDir(void) VLC_USED;
 VLC_API const char * config_GetConfDir( void ) VLC_USED;
 
 typedef enum vlc_userdir