attributes.h   attributes.h 
skipping to change at line 29 skipping to change at line 29
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*/ */
/* use gcc attribs to align critical data structures */ /* use gcc attribs to align critical data structures */
#ifndef ATTRIBUTE_H_ #ifndef ATTRIBUTE_H_
#define ATTRIBUTE_H_ #define ATTRIBUTE_H_
#ifdef ATTRIBUTE_ALIGNED_MAX
#define ATTR_ALIGN(align) __attribute__ ((__aligned__ ((ATTRIBUTE_ALIGNED_M
AX < align) ? ATTRIBUTE_ALIGNED_MAX : align)))
#else
#define ATTR_ALIGN(align)
#endif
#ifdef XINE_COMPILE #ifdef XINE_COMPILE
# include "configure.h" # include "configure.h"
#else #else
# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95 ) # if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95 )
# define SUPPORT_ATTRIBUTE_PACKED 1 # define SUPPORT_ATTRIBUTE_PACKED 1
# endif # endif
# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3 ) # if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3 )
# define SUPPORT_ATTRIBUTE_DEPRECATED 1 # define SUPPORT_ATTRIBUTE_DEPRECATED 1
# define SUPPORT_ATTRIBUTE_FORMAT 1 # define SUPPORT_ATTRIBUTE_FORMAT 1
skipping to change at line 60 skipping to change at line 54
# if __GNUC__ >= 4 # if __GNUC__ >= 4
# define SUPPORT_ATTRIBUTE_VISIBILITY_DEFAULT 1 # define SUPPORT_ATTRIBUTE_VISIBILITY_DEFAULT 1
# if __ELF__ # if __ELF__
# define SUPPORT_ATTRIBUTE_VISIBILITY_PROTECTED 1 # define SUPPORT_ATTRIBUTE_VISIBILITY_PROTECTED 1
# endif # endif
# define SUPPORT_ATTRIBUTE_SENTINEL 1 # define SUPPORT_ATTRIBUTE_SENTINEL 1
# endif # endif
#endif #endif
#ifdef ATTRIBUTE_ALIGNED_MAX
#define ATTR_ALIGN(align) __attribute__ ((__aligned__ ((ATTRIBUTE_ALIGNED_M
AX < align) ? ATTRIBUTE_ALIGNED_MAX : align)))
#else
#define ATTR_ALIGN(align)
#endif
/* Export protected only for libxine functions */ /* Export protected only for libxine functions */
#if defined(XINE_LIBRARY_COMPILE) && defined(SUPPORT_ATTRIBUTE_VISIBILITY_P ROTECTED) #if defined(XINE_LIBRARY_COMPILE) && defined(SUPPORT_ATTRIBUTE_VISIBILITY_P ROTECTED)
# define XINE_PROTECTED __attribute__((__visibility__("protected"))) # define XINE_PROTECTED __attribute__((__visibility__("protected")))
#elif defined(XINE_LIBRARY_COMPILE) && defined(SUPPORT_ATTRIBUTE_VISIBILITY _DEFAULT) #elif defined(XINE_LIBRARY_COMPILE) && defined(SUPPORT_ATTRIBUTE_VISIBILITY _DEFAULT)
# define XINE_PROTECTED __attribute__((__visibility__("default"))) # define XINE_PROTECTED __attribute__((__visibility__("default")))
#else #else
# define XINE_PROTECTED # define XINE_PROTECTED
#endif #endif
#ifdef SUPPORT_ATTRIBUTE_SENTINEL #ifdef SUPPORT_ATTRIBUTE_SENTINEL
skipping to change at line 81 skipping to change at line 81
#else #else
# define XINE_SENTINEL # define XINE_SENTINEL
#endif #endif
#if defined(SUPPORT_ATTRIBUTE_DEPRECATED) && !defined(XINE_COMPILE) #if defined(SUPPORT_ATTRIBUTE_DEPRECATED) && !defined(XINE_COMPILE)
# define XINE_DEPRECATED __attribute__((__deprecated__)) # define XINE_DEPRECATED __attribute__((__deprecated__))
#else #else
# define XINE_DEPRECATED # define XINE_DEPRECATED
#endif #endif
#ifdef SUPPORT_ATTRIBUTE_WEAK
# define XINE_WEAK __attribute__((weak))
#else
# define XINE_WEAK
#endif
#ifndef __attr_unused #ifndef __attr_unused
# ifdef SUPPORT_ATTRIBUTE_UNUSED # ifdef SUPPORT_ATTRIBUTE_UNUSED
# define __attr_unused __attribute__((__unused__)) # define __attr_unused __attribute__((__unused__))
# else # else
# define __attr_unused # define __attr_unused
# endif # endif
#endif #endif
/* Format attributes */ /* Format attributes */
#ifdef SUPPORT_ATTRIBUTE_FORMAT #ifdef SUPPORT_ATTRIBUTE_FORMAT
 End of changes. 3 change blocks. 
7 lines changed or deleted 13 lines changed or added


 audio_out.h   audio_out.h 
skipping to change at line 345 skipping to change at line 345
#define AO_PROP_EQ_2000HZ 13 /* equalizer */ #define AO_PROP_EQ_2000HZ 13 /* equalizer */
#define AO_PROP_EQ_4000HZ 14 /* equalizer */ #define AO_PROP_EQ_4000HZ 14 /* equalizer */
#define AO_PROP_EQ_8000HZ 15 /* equalizer */ #define AO_PROP_EQ_8000HZ 15 /* equalizer */
#define AO_PROP_EQ_16000HZ 16 /* equalizer */ #define AO_PROP_EQ_16000HZ 16 /* equalizer */
#define AO_PROP_CLOSE_DEVICE 17 /* force closing audio device */ #define AO_PROP_CLOSE_DEVICE 17 /* force closing audio device */
#define AO_PROP_AMP_MUTE 18 /* amplifier mute */ #define AO_PROP_AMP_MUTE 18 /* amplifier mute */
#define AO_PROP_NUM_STREAMS 19 /* read-only */ #define AO_PROP_NUM_STREAMS 19 /* read-only */
#define AO_PROP_CLOCK_SPEED 20 /* inform audio_out that speed has change d */ #define AO_PROP_CLOCK_SPEED 20 /* inform audio_out that speed has change d */
#define AO_PROP_BUFS_TOTAL 21 /* read-only */ #define AO_PROP_BUFS_TOTAL 21 /* read-only */
#define AO_PROP_BUFS_FREE 22 /* read-only */ #define AO_PROP_BUFS_FREE 22 /* read-only */
#define AO_NUM_PROPERTIES 23 #define AO_PROP_DRIVER_DELAY 23 /* read-only */
#define AO_NUM_PROPERTIES 24
/* audio device control ops */ /* audio device control ops */
#define AO_CTRL_PLAY_PAUSE 0 #define AO_CTRL_PLAY_PAUSE 0
#define AO_CTRL_PLAY_RESUME 1 #define AO_CTRL_PLAY_RESUME 1
#define AO_CTRL_FLUSH_BUFFERS 2 #define AO_CTRL_FLUSH_BUFFERS 2
/* above that value audio frames are discarded */ /* above that value audio frames are discarded */
#define AO_MAX_GAP 15000 #define AO_MAX_GAP 15000
#ifdef __cplusplus #ifdef __cplusplus
 End of changes. 1 change blocks. 
1 lines changed or deleted 2 lines changed or added


 version.h   version.h 
skipping to change at line 24 skipping to change at line 24
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
*/ */
/* static info - which libxine release this header came from */ /* static info - which libxine release this header came from */
#define XINE_MAJOR_VERSION 1 #define XINE_MAJOR_VERSION 1
#define XINE_MINOR_VERSION 2 #define XINE_MINOR_VERSION 2
#define XINE_SUB_VERSION 1 #define XINE_SUB_VERSION 2
#define XINE_VERSION "1.2.1" #define XINE_VERSION "1.2.2"
 End of changes. 1 change blocks. 
0 lines changed or deleted 0 lines changed or added


 xine.h   xine.h 
skipping to change at line 122 skipping to change at line 122
* *
* the only proper way to shut down the xine engine is to * the only proper way to shut down the xine engine is to
* call xine_exit() - do not try to free() the xine pointer * call xine_exit() - do not try to free() the xine pointer
* yourself and do not try to access any internal data structures * yourself and do not try to access any internal data structures
*/ */
xine_t *xine_new (void) XINE_PROTECTED; xine_t *xine_new (void) XINE_PROTECTED;
/* allow the setting of some flags before xine_init /* allow the setting of some flags before xine_init
* FIXME-ABI: this is currently GLOBAL * FIXME-ABI: this is currently GLOBAL
*/ */
void xine_set_flags (xine_t *, int) XINE_PROTECTED __attribute__((weak)); void xine_set_flags (xine_t *, int) XINE_PROTECTED XINE_WEAK;
#define XINE_FLAG_NO_WRITE_CACHE 1 #define XINE_FLAG_NO_WRITE_CACHE 1
/* /*
* post_init the xine engine * post_init the xine engine
*/ */
void xine_init (xine_t *self) XINE_PROTECTED; void xine_init (xine_t *self) XINE_PROTECTED;
/* /*
* helper functions to find and init audio/video drivers * helper functions to find and init audio/video drivers
* from xine's plugin collection * from xine's plugin collection
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 xineutils.h   xineutils.h 
skipping to change at line 93 skipping to change at line 93
/* generic accelerations */ /* generic accelerations */
#define MM_ACCEL_MLIB 0x00000001 #define MM_ACCEL_MLIB 0x00000001
/* x86 accelerations */ /* x86 accelerations */
#define MM_ACCEL_X86_MMX 0x80000000 #define MM_ACCEL_X86_MMX 0x80000000
#define MM_ACCEL_X86_3DNOW 0x40000000 #define MM_ACCEL_X86_3DNOW 0x40000000
#define MM_ACCEL_X86_MMXEXT 0x20000000 #define MM_ACCEL_X86_MMXEXT 0x20000000
#define MM_ACCEL_X86_SSE 0x10000000 #define MM_ACCEL_X86_SSE 0x10000000
#define MM_ACCEL_X86_SSE2 0x08000000 #define MM_ACCEL_X86_SSE2 0x08000000
#define MM_ACCEL_X86_SSE3 0x04000000
#define MM_ACCEL_X86_SSSE3 0x02000000
#define MM_ACCEL_X86_SSE4 0x01000000
#define MM_ACCEL_X86_SSE42 0x00800000
#define MM_ACCEL_X86_AVX 0x00400000
/* powerpc accelerations and features */ /* powerpc accelerations and features */
#define MM_ACCEL_PPC_ALTIVEC 0x04000000 #define MM_ACCEL_PPC_ALTIVEC 0x04000000
#define MM_ACCEL_PPC_CACHE32 0x02000000 #define MM_ACCEL_PPC_CACHE32 0x02000000
/* SPARC accelerations */ /* SPARC accelerations */
#define MM_ACCEL_SPARC_VIS 0x01000000 #define MM_ACCEL_SPARC_VIS 0x01000000
#define MM_ACCEL_SPARC_VIS2 0x00800000 #define MM_ACCEL_SPARC_VIS2 0x00800000
skipping to change at line 256 skipping to change at line 261
extern void (*yuy2_to_yv12) extern void (*yuy2_to_yv12)
(const unsigned char *yuy2_map, int yuy2_pitch, (const unsigned char *yuy2_map, int yuy2_pitch,
unsigned char *y_dst, int y_dst_pitch, unsigned char *y_dst, int y_dst_pitch,
unsigned char *u_dst, int u_dst_pitch, unsigned char *u_dst, int u_dst_pitch,
unsigned char *v_dst, int v_dst_pitch, unsigned char *v_dst, int v_dst_pitch,
int width, int height) XINE_PROTECTED; int width, int height) XINE_PROTECTED;
#define SCALEFACTOR 65536 #define SCALEFACTOR 65536
#define CENTERSAMPLE 128 #define CENTERSAMPLE 128
/* These conversions are normalised for the MPEG Y'CbCr colourspace.
* (Yes, we know that we call it YUV elsewhere.)
*/
#define COMPUTE_Y(r, g, b) \ #define COMPUTE_Y(r, g, b) \
(unsigned char) \ (unsigned char) \
((y_r_table[r] + y_g_table[g] + y_b_table[b]) / SCALEFACTOR) ((y_r_table[r] + y_g_table[g] + y_b_table[b]) / SCALEFACTOR)
#define COMPUTE_U(r, g, b) \ #define COMPUTE_U(r, g, b) \
(unsigned char) \ (unsigned char) \
((u_r_table[r] + u_g_table[g] + u_b_table[b]) / SCALEFACTOR + CENTERSAMPL E) ((u_r_table[r] + u_g_table[g] + u_b_table[b]) / SCALEFACTOR + CENTERSAMPL E)
#define COMPUTE_V(r, g, b) \ #define COMPUTE_V(r, g, b) \
(unsigned char) \ (unsigned char) \
((v_r_table[r] + v_g_table[g] + v_b_table[b]) / SCALEFACTOR + CENTERSAMPL E) ((v_r_table[r] + v_g_table[g] + v_b_table[b]) / SCALEFACTOR + CENTERSAMPL E)
 End of changes. 2 change blocks. 
0 lines changed or deleted 8 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/