diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-01-01 02:53:38 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-01-01 02:53:38 +0000 |
| commit | 60ce6073c01f97d55eece7ccba75c5d917aed163 (patch) | |
| tree | 41823be7fae7c1ff2552d752208ebfe0f1e1d0bf /include | |
| parent | 09338b3edd5b7b918d730aa244abb119c83ab527 (diff) | |
| parent | 158c5f2072b8a67a0c9e8d8523908a9d89188b1c (diff) | |
| download | xine-lib-60ce6073c01f97d55eece7ccba75c5d917aed163.tar.gz xine-lib-60ce6073c01f97d55eece7ccba75c5d917aed163.tar.bz2 | |
Merge from 1.1.
--HG--
rename : src/xine-utils/xmllexer.h => include/xine/xmllexer.h
rename : src/libffmpeg/ff_video_decoder.c => src/combined/ffmpeg/ff_video_decoder.c
rename : src/libmpeg2/header.c => src/video_dec/libmpeg2/header.c
rename : src/libmpeg2/mpeg2_internal.h => src/video_dec/libmpeg2/mpeg2_internal.h
Diffstat (limited to 'include')
| -rw-r--r-- | include/xine/xmllexer.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/xine/xmllexer.h b/include/xine/xmllexer.h index 2cec3d856..e93cb69ff 100644 --- a/include/xine/xmllexer.h +++ b/include/xine/xmllexer.h @@ -53,7 +53,8 @@ /* public functions */ void lexer_init(const char * buf, int size) XINE_PROTECTED; -int lexer_get_token(char ** tok, int * tok_size) XINE_PROTECTED; +int lexer_get_token_d(char ** tok, int * tok_size, int fixed) XINE_PROTECTED; +int lexer_get_token(char * tok, int tok_size) XINE_PROTECTED; char *lexer_decode_entities (const char *tok) XINE_PROTECTED; #endif |