diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2012-01-18 22:07:39 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2012-01-18 22:07:39 +0000 |
| commit | 50a5368b8765271ce273b9950ec4b85118ecb5a3 (patch) | |
| tree | 59d3ebc88c4bb198fa2a97b4b462c990a1f5c596 /include | |
| parent | 3119dd2de36dbd8bb9af95ab1826c15f3099b597 (diff) | |
| parent | a5d426c371ba02f6065a19dd9707cf248df245d5 (diff) | |
| download | xine-lib-50a5368b8765271ce273b9950ec4b85118ecb5a3.tar.gz xine-lib-50a5368b8765271ce273b9950ec4b85118ecb5a3.tar.bz2 | |
Merge from 1.1.
--HG--
rename : include/xine.h.in => include/xine.h
rename : src/xine-engine/xine_internal.h => include/xine/xine_internal.h
rename : src/combined/ffmpeg/ffmpeg_encoder.c => src/dxr3/ffmpeg_encoder.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/xine.h | 6 | ||||
| -rw-r--r-- | include/xine/xine_internal.h | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/include/xine.h b/include/xine.h index 0fa01dd4e..19731e820 100644 --- a/include/xine.h +++ b/include/xine.h @@ -117,6 +117,12 @@ int xine_check_version (int major, int minor, int sub) XINE_PROTECTED; */ xine_t *xine_new (void) XINE_PROTECTED; +/* allow the setting of some flags before xine_init + * FIXME-ABI: this is currently GLOBAL + */ +void xine_set_flags (xine_t *, int) XINE_PROTECTED __attribute__((weak)); +#define XINE_FLAG_NO_WRITE_CACHE 1 + /* * post_init the xine engine */ diff --git a/include/xine/xine_internal.h b/include/xine/xine_internal.h index 9a1ef699c..ea0f0074a 100644 --- a/include/xine/xine_internal.h +++ b/include/xine/xine_internal.h @@ -109,6 +109,12 @@ struct xine_s { #endif }; +/* FIXME-ABI Some global flag bits */ +/* See xine_set_flags() */ +#ifdef XINE_ENGINE_INTERNAL +extern int _x_flags XINE_PROTECTED; +#endif + /* * xine thread tickets */ |