Couldn't find wdiff. Falling back to builtin diff colouring...
| buffer.h | | buffer.h | |
| | | | |
| skipping to change at line 192 | | skipping to change at line 192 | |
| #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 | | #define BUF_VIDEO_SNOW 0x02670000 | |
|
| | | #define BUF_VIDEO_VP8 0x02680000 | |
| | | | |
| /* 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 264 | | skipping to change at line 265 | |
| #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_NB 0x033F0000 | |
| #define BUF_AUDIO_AMR_WB 0x03400000 | | #define BUF_AUDIO_AMR_WB 0x03400000 | |
| #define BUF_AUDIO_EAC3 0x03410000 | | #define BUF_AUDIO_EAC3 0x03410000 | |
|
| | | #define BUF_AUDIO_AAC_LATM 0x03420000 | |
| | | | |
| /* 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 | |
| | | | |
End of changes. 2 change blocks. |
| 0 lines changed or deleted | | 2 lines changed or added | |
|
| post.h | | post.h | |
| | | | |
| skipping to change at line 270 | | skipping to change at line 270 | |
| void _x_post_intercept_overlay_manager(video_overlay_manager_t *manager, po
st_video_port_t *port) XINE_PROTECTED; | | void _x_post_intercept_overlay_manager(video_overlay_manager_t *manager, po
st_video_port_t *port) XINE_PROTECTED; | |
| | | | |
| /* pointer retrieval functions */ | | /* pointer retrieval functions */ | |
| static inline post_video_port_t *_x_post_video_frame_to_port(vo_frame_t *fr
ame) { | | static inline post_video_port_t *_x_post_video_frame_to_port(vo_frame_t *fr
ame) { | |
| return (post_video_port_t *)frame->port; | | return (post_video_port_t *)frame->port; | |
| } | | } | |
| | | | |
| static inline post_video_port_t *_x_post_ovl_manager_to_port(video_overlay_
manager_t *manager) { | | static inline post_video_port_t *_x_post_ovl_manager_to_port(video_overlay_
manager_t *manager) { | |
| #ifdef POST_INTERNAL | | #ifdef POST_INTERNAL | |
| return (post_video_port_t *)( (uint8_t *)manager - | | return (post_video_port_t *)( (uint8_t *)manager - | |
|
| (unsigned)&(((post_video_port_t *)NULL)->manager_storage) ); | | (uint8_t*)&(((post_video_port_t *)NULL)->manager_storage) ); | |
| #else | | #else | |
| return (post_video_port_t *)( (uint8_t *)manager - sizeof(post_video_port
_t) ); | | return (post_video_port_t *)( (uint8_t *)manager - sizeof(post_video_port
_t) ); | |
| #endif | | #endif | |
| } | | } | |
| | | | |
| /* helper structure for intercepting audio port calls */ | | /* helper structure for intercepting audio port calls */ | |
| typedef struct post_audio_port_s post_audio_port_t; | | typedef struct post_audio_port_s post_audio_port_t; | |
| struct post_audio_port_s { | | struct post_audio_port_s { | |
| | | | |
| /* the new public port with replaced function pointers */ | | /* the new public port with replaced function pointers */ | |
| | | | |
End of changes. 1 change blocks. |
| 1 lines changed or deleted | | 1 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 19 | | #define XINE_SUB_VERSION 20 | |
| #define XINE_VERSION "1.1.19" | | #define XINE_VERSION "1.1.20" | |
| | | | |
| /* | | /* | |
| * 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 | |
| | | | |
| skipping to change at line 1786 | | skipping to change at line 1786 | |
| #define XINE_EVENT_VDR_USER7 326 | | #define XINE_EVENT_VDR_USER7 326 | |
| #define XINE_EVENT_VDR_USER8 327 | | #define XINE_EVENT_VDR_USER8 327 | |
| #define XINE_EVENT_VDR_USER9 328 | | #define XINE_EVENT_VDR_USER9 328 | |
| #define XINE_EVENT_VDR_VOLPLUS 329 | | #define XINE_EVENT_VDR_VOLPLUS 329 | |
| #define XINE_EVENT_VDR_VOLMINUS 330 | | #define XINE_EVENT_VDR_VOLMINUS 330 | |
| #define XINE_EVENT_VDR_MUTE 331 | | #define XINE_EVENT_VDR_MUTE 331 | |
| #define XINE_EVENT_VDR_AUDIO 332 | | #define XINE_EVENT_VDR_AUDIO 332 | |
| #define XINE_EVENT_VDR_INFO 333 | | #define XINE_EVENT_VDR_INFO 333 | |
| #define XINE_EVENT_VDR_CHANNELPREVIOUS 334 | | #define XINE_EVENT_VDR_CHANNELPREVIOUS 334 | |
| #define XINE_EVENT_VDR_SUBTITLES 335 | | #define XINE_EVENT_VDR_SUBTITLES 335 | |
|
| | | #define XINE_EVENT_VDR_USER0 336 | |
| /* some space for further keys */ | | /* some space for further keys */ | |
| #define XINE_EVENT_VDR_SETVIDEOWINDOW 350 | | #define XINE_EVENT_VDR_SETVIDEOWINDOW 350 | |
| #define XINE_EVENT_VDR_FRAMESIZECHANGED 351 | | #define XINE_EVENT_VDR_FRAMESIZECHANGED 351 | |
| #define XINE_EVENT_VDR_SELECTAUDIO 352 | | #define XINE_EVENT_VDR_SELECTAUDIO 352 | |
| #define XINE_EVENT_VDR_TRICKSPEEDMODE 353 | | #define XINE_EVENT_VDR_TRICKSPEEDMODE 353 | |
| #define XINE_EVENT_VDR_PLUGINSTARTED 354 | | #define XINE_EVENT_VDR_PLUGINSTARTED 354 | |
| #define XINE_EVENT_VDR_DISCONTINUITY 355 | | #define XINE_EVENT_VDR_DISCONTINUITY 355 | |
| | | | |
| /* events generated from post plugins */ | | /* events generated from post plugins */ | |
| #define XINE_EVENT_POST_TVTIME_FILMMODE_CHANGE 400 | | #define XINE_EVENT_POST_TVTIME_FILMMODE_CHANGE 400 | |
| | | | |
End of changes. 2 change blocks. |
| 2 lines changed or deleted | | 3 lines changed or added | |
|
| xine_internal.h | | xine_internal.h | |
| | | | |
| skipping to change at line 516 | | skipping to change at line 516 | |
| int _x_get_audio_channel (xine_stream_t *stream) XINE_PROTECTED; | | int _x_get_audio_channel (xine_stream_t *stream) XINE_PROTECTED; | |
| | | | |
| int _x_get_spu_channel (xine_stream_t *stream) XINE_PROTECTED; | | int _x_get_spu_channel (xine_stream_t *stream) XINE_PROTECTED; | |
| | | | |
| /* | | /* | |
| * internal events | | * internal events | |
| */ | | */ | |
| | | | |
| /* sent by dvb frontend to inform ts demuxer of new pids */ | | /* sent by dvb frontend to inform ts demuxer of new pids */ | |
| #define XINE_EVENT_PIDS_CHANGE 0x80000000 | | #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 | | * pids change event - inform ts demuxer of new pids | |
| */ | | */ | |
| typedef struct { | | typedef struct { | |
| int vpid; /* video program id */ | | int vpid; /* video program id */ | |
| int apid; /* audio program id */ | | int apid; /* audio program id */ | |
| } xine_pids_data_t; | | } xine_pids_data_t; | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| | | | |
End of changes. 1 change blocks. |
| 0 lines changed or deleted | | 2 lines changed or added | |
|
| xineutils.h | | xineutils.h | |
| | | | |
| skipping to change at line 211 | | skipping to change at line 211 | |
| #define xine_strsep(STRINGP, DELIM) strsep((STRINGP), (DELIM)) | | #define xine_strsep(STRINGP, DELIM) strsep((STRINGP), (DELIM)) | |
| #define xine_setenv(NAME, VAL, XX) setenv((NAME), (VAL), (XX)) | | #define xine_setenv(NAME, VAL, XX) setenv((NAME), (VAL), (XX)) | |
| | | | |
| /** | | /** | |
| * append to a string, reallocating | | * append to a string, reallocating | |
| * normally, updates & returns *dest | | * normally, updates & returns *dest | |
| * on error, *dest is unchanged & NULL is returned. | | * on error, *dest is unchanged & NULL is returned. | |
| */ | | */ | |
| char *xine_strcat_realloc (char **dest, char *append) 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. | |
| | | */ | |
| | | int xine_open_cloexec(const char *name, int flags) XINE_PROTECTED; | |
| | | | |
| | | /** | |
| | | * creates a file, ensuring that the descriptor will be closed | |
| | | * automatically after a fork/execute. | |
| | | */ | |
| | | int xine_create_cloexec(const char *name, int flags, mode_t mode) XINE_PROT
ECTED; | |
| | | | |
| | | /** | |
| | | * creates a socket, ensuring that the descriptor will be closed | |
| | | * automatically after a fork/execute. | |
| | | */ | |
| | | int xine_socket_cloexec(int domain, int type, int protocol) XINE_PROTECTED; | |
| | | | |
| /* | | /* | |
| * Color Conversion Utility Functions | | * Color Conversion Utility Functions | |
| * The following data structures and functions facilitate the conversion | | * The following data structures and functions facilitate the conversion | |
| * of RGB images to packed YUV (YUY2) images. There are also functions to | | * of RGB images to packed YUV (YUY2) images. There are also functions to | |
| * convert from YUV9 -> YV12. All of the meaty details are written in | | * convert from YUV9 -> YV12. All of the meaty details are written in | |
| * color.c. | | * color.c. | |
| */ | | */ | |
| | | | |
| typedef struct yuv_planes_s { | | typedef struct yuv_planes_s { | |
| | | | |
| | | | |
End of changes. 1 change blocks. |
| 0 lines changed or deleted | | 26 lines changed or added | |
|