alphablend.h   alphablend.h 
skipping to change at line 49 skipping to change at line 49
void _x_alphablend_init(alphablend_t *extra_data, xine_t *xine) XINE_PROTEC TED; void _x_alphablend_init(alphablend_t *extra_data, xine_t *xine) XINE_PROTEC TED;
void _x_alphablend_free(alphablend_t *extra_data) XINE_PROTECTED; void _x_alphablend_free(alphablend_t *extra_data) XINE_PROTECTED;
typedef struct { /* CLUT == Color LookUp Table */ typedef struct { /* CLUT == Color LookUp Table */
uint8_t cb; uint8_t cb;
uint8_t cr; uint8_t cr;
uint8_t y; uint8_t y;
uint8_t foo; uint8_t foo;
} XINE_PACKED clut_t; } XINE_PACKED clut_t;
void _x_clut_yuv2rgb(uint32_t *clut, int num_items, int color_matrix) XINE_
PROTECTED;
#define XX44_PALETTE_SIZE 32 #define XX44_PALETTE_SIZE 32
typedef struct { typedef struct {
unsigned size; unsigned size;
unsigned max_used; unsigned max_used;
uint32_t cluts[XX44_PALETTE_SIZE]; uint32_t cluts[XX44_PALETTE_SIZE];
/* cache palette entries for both colors and hili_colors */ /* cache palette entries for both colors and hili_colors */
int lookup_cache[OVL_PALETTE_SIZE*2]; int lookup_cache[OVL_PALETTE_SIZE*2];
} xx44_palette_t; } xx44_palette_t;
 End of changes. 1 change blocks. 
0 lines changed or deleted 3 lines changed or added


 buffer.h   buffer.h 
/* /*
* Copyright (C) 2000-2013 the xine project * Copyright (C) 2000-2014 the xine project
* *
* This file is part of xine, a free video player. * This file is part of xine, a free video player.
* *
* xine is free software; you can redistribute it and/or modify * xine is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* xine is distributed in the hope that it will be useful, * xine is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
skipping to change at line 275 skipping to change at line 275
#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 #define BUF_AUDIO_AAC_LATM 0x03420000
#define BUF_AUDIO_ADPCM_G726 0x03430000 #define BUF_AUDIO_ADPCM_G726 0x03430000
#define BUF_AUDIO_OPUS 0x03440000
/*@}*/ /*@}*/
/** /**
* @defgroup buffer_spu SPU buffer types * @defgroup buffer_spu 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
 End of changes. 2 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 5 #define XINE_SUB_VERSION 6
#define XINE_VERSION "1.2.5" #define XINE_VERSION "1.2.6"
 End of changes. 1 change blocks. 
0 lines changed or deleted 0 lines changed or added


 video_overlay.h   video_overlay.h 
/* /*
* Copyright (C) 2000-2009 the xine project * Copyright (C) 2000-2014 the xine project
* *
* This file is part of xine, a free video player. * This file is part of xine, a free video player.
* *
* xine is free software; you can redistribute it and/or modify * xine is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* xine is distributed in the hope that it will be useful, * xine is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
skipping to change at line 64 skipping to change at line 64
/* Once video_out blend_yuv etc. can take rle_elem_t with Colour, blend and length information. /* Once video_out blend_yuv etc. can take rle_elem_t with Colour, blend and length information.
* we can remove clut and blend from this structure. * we can remove clut and blend from this structure.
* This will allow for many more colours for OSD. * This will allow for many more colours for OSD.
*/ */
uint32_t event_type; /* Show SPU, Show OSD, Hide etc. */ uint32_t event_type; /* Show SPU, Show OSD, Hide etc. */
video_overlay_object_t object; /* The image data. */ video_overlay_object_t object; /* The image data. */
} video_overlay_event_t; } video_overlay_event_t;
video_overlay_manager_t *_x_video_overlay_new_manager(xine_t *) XINE_MALLOC XINE_PROTECTED; video_overlay_manager_t *_x_video_overlay_new_manager(xine_t *) XINE_MALLOC XINE_PROTECTED;
/* Transport color matrix setting inside those unused "foo" fields.
Guard against uninitialized values. */
#define _X_SET_CLUT_CM(clut,color_matrix) { \
uint8_t *q = (uint8_t *)clut; \
q[3] = 'X'; \
q[7] = 'C'; \
q[11] = 'M'; \
q[15] = color_matrix; \
}
void _x_overlay_clut_yuv2rgb(vo_overlay_t *overlay, int video_color_matrix)
XINE_PROTECTED;
void _x_overlay_to_argb32(const vo_overlay_t *overlay, uint32_t *rgba, int
stride, const char *format) XINE_PROTECTED;
#endif #endif
 End of changes. 2 change blocks. 
1 lines changed or deleted 16 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/