diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-05-06 02:27:38 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-05-06 02:27:38 +0100 |
| commit | 8ff78df42588e88762aaf1581f0e86a270f4a59d (patch) | |
| tree | 7511f7788290a38a78d523d7c824efa31ad5e215 /include | |
| parent | 61445f16252380d4f6b66f2c5680d36e62bbfd0f (diff) | |
| parent | d5be45ea2436cdc45f086b54516157b5b2394715 (diff) | |
| download | xine-lib-8ff78df42588e88762aaf1581f0e86a270f4a59d.tar.gz xine-lib-8ff78df42588e88762aaf1581f0e86a270f4a59d.tar.bz2 | |
Merge from 1.1.
--HG--
rename : include/xine.h.in => include/xine.h
rename : src/xine-utils/attributes.h => include/xine/attributes.h
rename : src/xine-utils/xineutils.h => include/xine/xineutils.h
rename : src/combined/decoder_flac.c => src/combined/flac_decoder.c
rename : src/libxineadec/xine_speex_decoder.c => src/combined/xine_speex_decoder.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/xine.h | 9 | ||||
| -rw-r--r-- | include/xine/attributes.h | 6 | ||||
| -rw-r--r-- | include/xine/xineutils.h | 1 |
3 files changed, 10 insertions, 6 deletions
diff --git a/include/xine.h b/include/xine.h index b349c8c4e..6eaac8975 100644 --- a/include/xine.h +++ b/include/xine.h @@ -1256,12 +1256,9 @@ typedef struct { void *user_data; /* OR'ed frame_format - * a frontend must at least support rgb - * a frontend supporting yuv must support both yv12 and yuy2 - * then possible combinations are: - * XINE_VORAW_RGB ( rgb ) - * XINE_VORAW_YV12|XINE_VORAW_YUY2|XINE_VORAW_RGB ( yv12, yuy2 and rgb ) - * + * Unsupported frame formats are converted to rgb. + * XINE_VORAW_RGB is always assumed by the driver, even if not set. + * So a frontend must at least support rgb. * Be aware that rgb requires more cpu than yuv, * so avoid its usage for video playback. * However, it's usefull for single frame capture (e.g. thumbs) diff --git a/include/xine/attributes.h b/include/xine/attributes.h index b25c76572..c339e7113 100644 --- a/include/xine/attributes.h +++ b/include/xine/attributes.h @@ -51,6 +51,12 @@ # define XINE_SENTINEL #endif +#ifdef SUPPORT_ATTRIBUTE_DEPRECATED +# define XINE_DEPRECATED __attribute__((__deprecated__)) +#else +# define XINE_DEPRECATED +#endif + #ifndef __attr_unused # ifdef SUPPORT_ATTRIBUTE_UNUSED # define __attr_unused __attribute__((__unused__)) diff --git a/include/xine/xineutils.h b/include/xine/xineutils.h index a94835f5a..7eb0acdd8 100644 --- a/include/xine/xineutils.h +++ b/include/xine/xineutils.h @@ -629,6 +629,7 @@ const char *xine_get_homedir(void) XINE_PROTECTED; /* * Get other xine directories. */ +const char *xine_get_pluginroot(void) XINE_PROTECTED; const char *xine_get_plugindir(void) XINE_PROTECTED; const char *xine_get_fontdir(void) XINE_PROTECTED; const char *xine_get_localedir(void) XINE_PROTECTED; |