diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-01-24 13:47:01 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-01-24 13:47:01 +0000 |
| commit | d3f318eec71d38ce34f590daef0fed1f6cbf2eae (patch) | |
| tree | 0d9e5b6b1e1832e206a229d2da3f24a39af2d8e5 /src/xine-engine/xine.c | |
| parent | 2f9b558e6ff6f599e4e6ef3422f48b17c44f178b (diff) | |
| parent | 7598a6152ba55ef0ff8dda7f1b7729d2bb22a594 (diff) | |
| download | xine-lib-d3f318eec71d38ce34f590daef0fed1f6cbf2eae.tar.gz xine-lib-d3f318eec71d38ce34f590daef0fed1f6cbf2eae.tar.bz2 | |
Merge from -plugin-loader branch.
base64.{c,h} functions are given "xine_" prefixes and are exported.
--HG--
rename : src/xine-utils/base64.h => include/xine/base64.h
rename : src/xine-engine/configfile.h => include/xine/configfile.h
rename : src/xine-engine/plugin_catalog.h => include/xine/plugin_catalog.h
rename : src/xine-utils/xineutils.h => include/xine/xineutils.h
rename : src/input/base64.c => src/xine-utils/base64.c
Diffstat (limited to 'src/xine-engine/xine.c')
| -rw-r--r-- | src/xine-engine/xine.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c index fa79ea875..c6dc8a2ce 100644 --- a/src/xine-engine/xine.c +++ b/src/xine-engine/xine.c @@ -52,6 +52,7 @@ #define LOG_VERBOSE /* #define LOG +#define DEBUG */ #define XINE_ENABLE_EXPERIMENTAL_FEATURES @@ -1699,7 +1700,7 @@ void xine_init (xine_t *this) { /* * plugins */ - _x_scan_plugins(this); + XINE_PROFILE(_x_scan_plugins(this)); #ifdef HAVE_SETLOCALE if (!setlocale(LC_CTYPE, "")) |