diff options
| author | Petri Hintukainen <phintuka@users.sourceforge.net> | 2011-10-17 13:14:43 +0300 |
|---|---|---|
| committer | Petri Hintukainen <phintuka@users.sourceforge.net> | 2011-10-17 13:14:43 +0300 |
| commit | 81c84b6bf06482c5988fd16f68050177c1afc358 (patch) | |
| tree | fd0598beb671b27aef81c91af8ed93fd8330eb55 /include | |
| parent | 0f53dcaa8cae2d37e886fff0d7a44ed6e679aeb4 (diff) | |
| parent | 83049ca9ad0d39a5795b586b76f954748a3de316 (diff) | |
| download | xine-lib-81c84b6bf06482c5988fd16f68050177c1afc358.tar.gz xine-lib-81c84b6bf06482c5988fd16f68050177c1afc358.tar.bz2 | |
Merge from 1.1
--HG--
rename : src/xine-engine/xine_internal.h => include/xine/xine_internal.h
rename : src/xine-utils/xineutils.h => include/xine/xineutils.h
Diffstat (limited to 'include')
| -rw-r--r-- | include/xine/xine_internal.h | 2 | ||||
| -rw-r--r-- | include/xine/xineutils.h | 8 |
2 files changed, 10 insertions, 0 deletions
diff --git a/include/xine/xine_internal.h b/include/xine/xine_internal.h index 7064539ab..9a1ef699c 100644 --- a/include/xine/xine_internal.h +++ b/include/xine/xine_internal.h @@ -520,6 +520,8 @@ int _x_get_spu_channel (xine_stream_t *stream) XINE_PROTECTED; /* sent by dvb frontend to inform ts demuxer of new pids */ #define XINE_EVENT_PIDS_CHANGE 0x80000000 +/* sent by BluRay input plugin to inform ts demuxer about end of clip */ +#define XINE_EVENT_END_OF_CLIP 0x80000001 /* * pids change event - inform ts demuxer of new pids diff --git a/include/xine/xineutils.h b/include/xine/xineutils.h index fa34931ec..e822ccfe8 100644 --- a/include/xine/xineutils.h +++ b/include/xine/xineutils.h @@ -182,6 +182,14 @@ void xine_usec_sleep(unsigned usec) XINE_PROTECTED; char *xine_strcat_realloc (char **dest, char *append) XINE_PROTECTED; /** + * asprintf wrapper + * allocate a string large enough to hold the output, and return a pointer to + * it. This pointer should be passed to free when it is no longer needed. + * return NULL on error. + */ +char *_x_asprintf(const char *format, ...) XINE_PROTECTED XINE_MALLOC XINE_FORMAT_PRINTF(1, 2); + +/** * opens a file, ensuring that the descriptor will be closed * automatically after a fork/execute. */ |