diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-12-30 18:37:29 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-12-30 18:37:29 +0000 |
| commit | cb2f69533fd5771c386d1b994b2179e76c4ded54 (patch) | |
| tree | 98f4f9bff7afd6e9f0ce2c50b01d1e5ad55ec539 /include | |
| parent | 6dbb05a4cba3cdc811308762058d722f11464683 (diff) | |
| parent | aa3d3aacdb991ad989933d71734e300535c7d350 (diff) | |
| download | xine-lib-cb2f69533fd5771c386d1b994b2179e76c4ded54.tar.gz xine-lib-cb2f69533fd5771c386d1b994b2179e76c4ded54.tar.bz2 | |
Merge from 1.1 (except po/*; translators needed for this).
--HG--
rename : src/video_out/vidix/drivers/mga_vid.c => contrib/vidix/drivers/mga_vid.c
rename : src/video_out/vidix/drivers/nvidia_vid.c => contrib/vidix/drivers/nvidia_vid.c
rename : src/video_out/vidix/drivers/savage_vid.c => contrib/vidix/drivers/savage_vid.c
rename : src/xine-engine/video_out.h => include/xine/video_out.h
rename : src/xine-utils/xmllexer.h => include/xine/xmllexer.h
rename : po/libxine1.pot => po/libxine2.pot
rename : src/libsputext/xine_sputext_decoder.c => src/spu_dec/sputext_decoder.c
rename : src/libsputext/demux_sputext.c => src/spu_dec/sputext_demuxer.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/xine/video_out.h | 6 | ||||
| -rw-r--r-- | include/xine/xmllexer.h | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/include/xine/video_out.h b/include/xine/video_out.h index c7432e1fc..f34380af1 100644 --- a/include/xine/video_out.h +++ b/include/xine/video_out.h @@ -247,7 +247,11 @@ struct xine_video_port_s { #define VO_PROP_WINDOW_HEIGHT 16 /* read-only */ #define VO_PROP_BUFS_IN_FIFO 17 /* read-only */ #define VO_PROP_NUM_STREAMS 18 /* read-only */ -#define VO_NUM_PROPERTIES 19 +#define VO_PROP_OUTPUT_WIDTH 19 /* read-only */ +#define VO_PROP_OUTPUT_HEIGHT 20 /* read-only */ +#define VO_PROP_OUTPUT_XOFFSET 21 /* read-only */ +#define VO_PROP_OUTPUT_YOFFSET 22 /* read-only */ +#define VO_NUM_PROPERTIES 23 /* number of colors in the overlay palette. Currently limited to 256 at most, because some alphablend functions use an 8-bit index into diff --git a/include/xine/xmllexer.h b/include/xine/xmllexer.h index 10bcc8676..2cec3d856 100644 --- a/include/xine/xmllexer.h +++ b/include/xine/xmllexer.h @@ -53,7 +53,7 @@ /* 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(char ** tok, int * tok_size) XINE_PROTECTED; char *lexer_decode_entities (const char *tok) XINE_PROTECTED; #endif |