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/input/input_cdda.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/input/input_cdda.c')
| -rw-r--r-- | src/input/input_cdda.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c index f8819f9f4..0e378c299 100644 --- a/src/input/input_cdda.c +++ b/src/input/input_cdda.c @@ -65,7 +65,6 @@ */ #include "sha1.h" -#include "base64.h" #include <xine/xine_internal.h> #include <xine/xineutils.h> #include <xine/input_plugin.h> @@ -1936,7 +1935,7 @@ static void _cdda_cdindex(cdda_input_plugin_t *this, cdrom_toc *toc) { sha_final(digest, &sha); - base64 = rfc822_binary(digest, 20, &size); + base64 = xine_rfc822_binary(digest, 20, &size); base64[size] = 0; _x_meta_info_set_utf8(this->stream, XINE_META_INFO_CDINDEX_DISCID, base64); |