buffer.h   buffer.h 
skipping to change at line 42 skipping to change at line 42
#define HAVE_BUFFER_H #define HAVE_BUFFER_H
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif #endif
#include <string.h>
#include <stdio.h> #include <stdio.h>
#include <pthread.h> #include <pthread.h>
#include <sys/types.h> #include <sys/types.h>
#ifdef XINE_COMPILE #ifdef XINE_COMPILE
# include <inttypes.h> # include <inttypes.h>
# include "attributes.h" # include "attributes.h"
#else #else
# include <xine/os_types.h> # include <xine/os_types.h>
# include <xine/attributes.h> # include <xine/attributes.h>
skipping to change at line 194 skipping to change at line 195
#define BUF_VIDEO_AVS 0x025D0000 #define BUF_VIDEO_AVS 0x025D0000
#define BUF_VIDEO_SMACKER 0x025E0000 #define BUF_VIDEO_SMACKER 0x025E0000
#define BUF_VIDEO_NUV 0x025F0000 #define BUF_VIDEO_NUV 0x025F0000
#define BUF_VIDEO_KMVC 0x02600000 #define BUF_VIDEO_KMVC 0x02600000
#define BUF_VIDEO_FLASHSV 0x02610000 #define BUF_VIDEO_FLASHSV 0x02610000
#define BUF_VIDEO_CAVS 0x02620000 #define BUF_VIDEO_CAVS 0x02620000
#define BUF_VIDEO_VP6F 0x02630000 #define BUF_VIDEO_VP6F 0x02630000
#define BUF_VIDEO_THEORA_RAW 0x02640000 #define BUF_VIDEO_THEORA_RAW 0x02640000
#define BUF_VIDEO_VC1 0x02650000 #define BUF_VIDEO_VC1 0x02650000
#define BUF_VIDEO_VMNC 0x02660000 #define BUF_VIDEO_VMNC 0x02660000
#define BUF_VIDEO_SNOW 0x02670000
/* audio buffer types: (please keep in sync with buffer_types.c) */ /* audio buffer types: (please keep in sync with buffer_types.c) */
#define BUF_AUDIO_BASE 0x03000000 #define BUF_AUDIO_BASE 0x03000000
#define BUF_AUDIO_UNKNOWN 0x03ff0000 /* no decoder should handle this one */ #define BUF_AUDIO_UNKNOWN 0x03ff0000 /* no decoder should handle this one */
#define BUF_AUDIO_A52 0x03000000 #define BUF_AUDIO_A52 0x03000000
#define BUF_AUDIO_MPEG 0x03010000 #define BUF_AUDIO_MPEG 0x03010000
#define BUF_AUDIO_LPCM_BE 0x03020000 #define BUF_AUDIO_LPCM_BE 0x03020000
#define BUF_AUDIO_LPCM_LE 0x03030000 #define BUF_AUDIO_LPCM_LE 0x03030000
#define BUF_AUDIO_WMAV1 0x03040000 #define BUF_AUDIO_WMAV1 0x03040000
skipping to change at line 262 skipping to change at line 264
#define BUF_AUDIO_MPC 0x03350000 #define BUF_AUDIO_MPC 0x03350000
#define BUF_AUDIO_SHORTEN 0x03360000 #define BUF_AUDIO_SHORTEN 0x03360000
#define BUF_AUDIO_WESTWOOD_SND1 0x03370000 #define BUF_AUDIO_WESTWOOD_SND1 0x03370000
#define BUF_AUDIO_WMALL 0x03380000 #define BUF_AUDIO_WMALL 0x03380000
#define BUF_AUDIO_TRUESPEECH 0x03390000 #define BUF_AUDIO_TRUESPEECH 0x03390000
#define BUF_AUDIO_TTA 0x033A0000 #define BUF_AUDIO_TTA 0x033A0000
#define BUF_AUDIO_SMACKER 0x033B0000 #define BUF_AUDIO_SMACKER 0x033B0000
#define BUF_AUDIO_FLVADPCM 0x033C0000 #define BUF_AUDIO_FLVADPCM 0x033C0000
#define BUF_AUDIO_WAVPACK 0x033D0000 #define BUF_AUDIO_WAVPACK 0x033D0000
#define BUF_AUDIO_MP3ADU 0x033E0000 #define BUF_AUDIO_MP3ADU 0x033E0000
#define BUF_AUDIO_AMR_NB 0x033F0000
#define BUF_AUDIO_AMR_WB 0x03400000
/* spu buffer types: */ /* spu buffer types: */
#define BUF_SPU_BASE 0x04000000 #define BUF_SPU_BASE 0x04000000
#define BUF_SPU_DVD 0x04000000 #define BUF_SPU_DVD 0x04000000
#define BUF_SPU_TEXT 0x04010000 #define BUF_SPU_TEXT 0x04010000
#define BUF_SPU_CC 0x04020000 #define BUF_SPU_CC 0x04020000
#define BUF_SPU_DVB 0x04030000 #define BUF_SPU_DVB 0x04030000
#define BUF_SPU_SVCD 0x04040000 #define BUF_SPU_SVCD 0x04040000
#define BUF_SPU_CVD 0x04050000 #define BUF_SPU_CVD 0x04050000
skipping to change at line 666 skipping to change at line 670
#ifndef SUPPORT_ATTRIBUTE_PACKED #ifndef SUPPORT_ATTRIBUTE_PACKED
#pragma pack() #pragma pack()
#endif #endif
/* convert xine_bmiheader struct from little endian */ /* convert xine_bmiheader struct from little endian */
void _x_bmiheader_le2me( xine_bmiheader *bih ) XINE_PROTECTED; void _x_bmiheader_le2me( xine_bmiheader *bih ) XINE_PROTECTED;
/* convert xine_waveformatex struct from little endian */ /* convert xine_waveformatex struct from little endian */
void _x_waveformatex_le2me( xine_waveformatex *wavex ) XINE_PROTECTED; void _x_waveformatex_le2me( xine_waveformatex *wavex ) XINE_PROTECTED;
static inline _x_is_fourcc(void *ptr, void *tag) {
return memcmp(ptr, tag, 4) == 0;
}
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif
 End of changes. 4 change blocks. 
0 lines changed or deleted 8 lines changed or added


 xine.h   xine.h 
skipping to change at line 112 skipping to change at line 112
const char *xine_get_version_string (void) XINE_PROTECTED; const char *xine_get_version_string (void) XINE_PROTECTED;
void xine_get_version (int *major, int *minor, int *sub) XINE_PROTECTED; void xine_get_version (int *major, int *minor, int *sub) XINE_PROTECTED;
/* compare given version to libxine version, /* compare given version to libxine version,
return 1 if compatible, 0 otherwise */ return 1 if compatible, 0 otherwise */
int xine_check_version (int major, int minor, int sub) XINE_PROTECTED; int xine_check_version (int major, int minor, int sub) XINE_PROTECTED;
/* 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 1 #define XINE_MINOR_VERSION 1
#define XINE_SUB_VERSION 14 #define XINE_SUB_VERSION 15
#define XINE_VERSION "1.1.14" #define XINE_VERSION "1.1.15"
/* /*
* pre-init the xine engine * pre-init the xine engine
* *
* will first malloc and init a xine_t, create an empty config * will first malloc and init a xine_t, create an empty config
* system, then scan through all installed plugins and add them * system, then scan through all installed plugins and add them
* to an internal list for later use. * to an internal list for later use.
* *
* to fully init the xine engine, you have to load config values * to fully init the xine engine, you have to load config values
* (either using your own storage method and calling * (either using your own storage method and calling
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 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/