diff options
| author | Diego E. 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-12-15 19:13:59 +0100 |
|---|---|---|
| committer | Diego E. 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-12-15 19:13:59 +0100 |
| commit | 4c90da28e5dd01cb5fa01a293c418690d395d9f6 (patch) | |
| tree | a7f262652b9a62bab6ec567bfced62528f4e4b9d /include | |
| parent | 9c92484c911e0f3d401a0230c90c4bcf40b84c05 (diff) | |
| parent | e5be769581739cdafd385d55896abca4816ea29e (diff) | |
| download | xine-lib-4c90da28e5dd01cb5fa01a293c418690d395d9f6.tar.gz xine-lib-4c90da28e5dd01cb5fa01a293c418690d395d9f6.tar.bz2 | |
Merge from 1.1; update PO files; make buildable.
--HG--
rename : include/xine.h.in => include/xine.h
rename : src/xine-utils/attributes.h => include/xine/attributes.h
rename : src/xine-engine/buffer.h => include/xine/buffer.h
rename : m4/_xine.m4 => m4/types.m4
rename : po/libxine1.pot => po/libxine2.pot
rename : src/libfaad/xine_faad_decoder.c => src/audio_dec/xine_faad_decoder.c
rename : src/libspucc/cc_decoder.h => src/spu_dec/cc_decoder.h
rename : src/libspucmml/xine_cmml_decoder.c => src/spu_dec/cmml_decoder.c
rename : src/libspudec/xine_spu_decoder.c => src/spu_dec/spu_decoder.c
rename : src/libspudvb/xine_spudvb_decoder.c => src/spu_dec/spudvb_decoder.c
rename : src/libspucc/xine_cc_decoder.c => src/spu_dec/xine_cc_decoder.c
rename : src/libmpeg2/mpeg2.h => src/video_dec/libmpeg2/mpeg2.h
Diffstat (limited to 'include')
| -rw-r--r-- | include/xine.h | 1 | ||||
| -rw-r--r-- | include/xine/attributes.h | 6 | ||||
| -rw-r--r-- | include/xine/buffer.h | 6 |
3 files changed, 8 insertions, 5 deletions
diff --git a/include/xine.h b/include/xine.h index f3c79a7b4..613850b09 100644 --- a/include/xine.h +++ b/include/xine.h @@ -946,6 +946,7 @@ const char *xine_get_meta_info (xine_stream_t *stream, int info) XINE_PROTECTE #define XINE_META_INFO_INPUT_PLUGIN 9 #define XINE_META_INFO_CDINDEX_DISCID 10 #define XINE_META_INFO_TRACK_NUMBER 11 +#define XINE_META_INFO_COMPOSER 12 /********************************************************************* diff --git a/include/xine/attributes.h b/include/xine/attributes.h index 3819818d5..d7a0e2f1e 100644 --- a/include/xine/attributes.h +++ b/include/xine/attributes.h @@ -1,7 +1,7 @@ /* * attributes.h * Copyright (C) 1999-2000 Aaron Holtzman <aholtzma@ess.engr.uvic.ca> - * Copyright (C) 2001-2007 xine developers + * Copyright (C) 2001-2008 xine developers * * This file was originally part of mpeg2dec, a free MPEG-2 video stream * decoder. @@ -72,7 +72,7 @@ # define XINE_SENTINEL #endif -#ifdef SUPPORT_ATTRIBUTE_DEPRECATED +#if defined(SUPPORT_ATTRIBUTE_DEPRECATED) && !defined(XINE_COMPILE) # define XINE_DEPRECATED __attribute__((__deprecated__)) #else # define XINE_DEPRECATED @@ -89,8 +89,10 @@ /* Format attributes */ #ifdef SUPPORT_ATTRIBUTE_FORMAT # define XINE_FORMAT_PRINTF(fmt,var) __attribute__((__format__(__printf__, fmt, var))) +# define XINE_FORMAT_SCANF(fmt,var) __attribute__((__format__(__scanf__, fmt, var))) #else # define XINE_FORMAT_PRINTF(fmt,var) +# define XINE_FORMAT_SCANF(fmt,var) #endif #ifdef SUPPORT_ATTRIBUTE_FORMAT_ARG # define XINE_FORMAT_PRINTF_ARG(fmt) __attribute__((__format_arg__(fmt))) diff --git a/include/xine/buffer.h b/include/xine/buffer.h index 110bcf4b9..e64246a41 100644 --- a/include/xine/buffer.h +++ b/include/xine/buffer.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000-2004 the xine project + * Copyright (C) 2000-2008 the xine project * * This file is part of xine, a free video player. * @@ -655,7 +655,7 @@ uint32_t _x_fourcc_to_buf_video( uint32_t fourcc_int ) XINE_PROTECTED; * @param buf_type One of the \ref buffer_video "BUF_VIDEO_xxx" values. * @sa _x_buf_audio_name */ -const char *_x_buf_video_name( uint32_t buf_type ) XINE_PROTECTED; +const char * _x_buf_video_name( uint32_t buf_type ) XINE_PROTECTED; /** * @brief Returns the \ref buffer_audio "BUF_AUDIO_xxx" for the given formattag. @@ -669,7 +669,7 @@ uint32_t _x_formattag_to_buf_audio( uint32_t formattag ) XINE_PROTECTED; * @param buf_type One of the \ref buffer_audio "BUF_AUDIO_xxx" values. * @sa _x_buf_video_name */ -const char *_x_buf_audio_name( uint32_t buf_type ) XINE_PROTECTED; +const char * _x_buf_audio_name( uint32_t buf_type ) XINE_PROTECTED; /** |