diff options
Diffstat (limited to 'src/xine-utils')
-rw-r--r-- | src/xine-utils/color.c | 18 | ||||
-rw-r--r-- | src/xine-utils/memcpy.c | 2 | ||||
-rw-r--r-- | src/xine-utils/utils.c | 4 | ||||
-rw-r--r-- | src/xine-utils/xmlparser.c | 6 |
4 files changed, 16 insertions, 14 deletions
diff --git a/src/xine-utils/color.c b/src/xine-utils/color.c index 6815bdef1..b44507091 100644 --- a/src/xine-utils/color.c +++ b/src/xine-utils/color.c @@ -61,7 +61,7 @@ * instructions), these macros will automatically map to those special * instructions. * - * $Id: color.c,v 1.20 2003/07/12 04:34:39 miguelfreitas Exp $ + * $Id: color.c,v 1.21 2003/07/27 12:47:23 hadess Exp $ */ #include "xine_internal.h" @@ -202,7 +202,7 @@ void free_yuv_planes(yuv_planes_t *yuv_planes) { * * YUY2 map: Y0 U0 Y1 V1 Y2 U2 Y3 V3 */ -void yuv444_to_yuy2_c(yuv_planes_t *yuv_planes, unsigned char *yuy2_map, +static void yuv444_to_yuy2_c(yuv_planes_t *yuv_planes, unsigned char *yuy2_map, int pitch) { int row_ptr, pixel_ptr; @@ -316,7 +316,7 @@ void yuv444_to_yuy2_c(yuv_planes_t *yuv_planes, unsigned char *yuy2_map, * enough. * */ -void yuv444_to_yuy2_mmx(yuv_planes_t *yuv_planes, unsigned char *yuy2_map, +static void yuv444_to_yuy2_mmx(yuv_planes_t *yuv_planes, unsigned char *yuy2_map, int pitch) { #ifdef ARCH_X86 int h, i, j, k; @@ -570,7 +570,7 @@ static void upsample_c_plane_c(unsigned char *src, int src_width, * yuv9_to_yv12_c * */ -void yuv9_to_yv12_c +static void yuv9_to_yv12_c (unsigned char *y_src, int y_src_pitch, unsigned char *y_dest, int y_dest_pitch, unsigned char *u_src, int u_src_pitch, unsigned char *u_dest, int u_dest_pitch, unsigned char *v_src, int v_src_pitch, unsigned char *v_dest, int v_dest_pitch, @@ -599,7 +599,7 @@ void yuv9_to_yv12_c * yuv411_to_yv12_c * */ -void yuv411_to_yv12_c +static void yuv411_to_yv12_c (unsigned char *y_src, int y_src_pitch, unsigned char *y_dest, int y_dest_pitch, unsigned char *u_src, int u_src_pitch, unsigned char *u_dest, int u_dest_pitch, unsigned char *v_src, int v_src_pitch, unsigned char *v_dest, int v_dest_pitch, @@ -670,7 +670,7 @@ void yuv411_to_yv12_c * original conversion routine from Videolan project * changed to support interlaced frames and use simple mean interpolation [MF] *****************************************************************************/ -void yv12_to_yuy2_c +static void yv12_to_yuy2_c (unsigned char *y_src, int y_src_pitch, unsigned char *u_src, int u_src_pitch, unsigned char *v_src, int v_src_pitch, @@ -834,7 +834,7 @@ do { #endif -void yv12_to_yuy2_mmxext +static void yv12_to_yuy2_mmxext (unsigned char *y_src, int y_src_pitch, unsigned char *u_src, int u_src_pitch, unsigned char *v_src, int v_src_pitch, @@ -960,7 +960,7 @@ void yv12_to_yuy2_mmxext *p_y1++ = *p_line1++; *p_y2++ = *p_line2++; \ *p_v++ = (*p_line1++ + *p_line2++)>>1; -void yuy2_to_yv12_c +static void yuy2_to_yv12_c (unsigned char *yuy2_map, int yuy2_pitch, unsigned char *y_dst, int y_dst_pitch, unsigned char *u_dst, int u_dst_pitch, @@ -1053,7 +1053,7 @@ do { #endif -void yuy2_to_yv12_mmxext +static void yuy2_to_yv12_mmxext (unsigned char *yuy2_map, int yuy2_pitch, unsigned char *y_dst, int y_dst_pitch, unsigned char *u_dst, int u_dst_pitch, diff --git a/src/xine-utils/memcpy.c b/src/xine-utils/memcpy.c index 68094364f..b6326a696 100644 --- a/src/xine-utils/memcpy.c +++ b/src/xine-utils/memcpy.c @@ -302,7 +302,7 @@ static void * mmx_memcpy(void * to, const void * from, size_t len) return retval; } -void * mmx2_memcpy(void * to, const void * from, size_t len) +static void * mmx2_memcpy(void * to, const void * from, size_t len) { void *retval; size_t i; diff --git a/src/xine-utils/utils.c b/src/xine-utils/utils.c index 6c7c382c6..02c9b1ef6 100644 --- a/src/xine-utils/utils.c +++ b/src/xine-utils/utils.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: utils.c,v 1.16 2003/07/16 22:11:14 jstembridge Exp $ + * $Id: utils.c,v 1.17 2003/07/27 12:47:23 hadess Exp $ * */ #define _POSIX_PTHREAD_SEMANTICS 1 /* for 5-arg getpwuid_r on solaris */ @@ -26,6 +26,8 @@ #include "config.h" #endif +#include "xineutils.h" + #include <stdio.h> #include <stdlib.h> #include <errno.h> diff --git a/src/xine-utils/xmlparser.c b/src/xine-utils/xmlparser.c index 7fc178947..df9c65a09 100644 --- a/src/xine-utils/xmlparser.c +++ b/src/xine-utils/xmlparser.c @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xmlparser.c,v 1.4 2003/07/19 00:22:43 tmattern Exp $ + * $Id: xmlparser.c,v 1.5 2003/07/27 12:47:23 hadess Exp $ * */ @@ -94,7 +94,7 @@ void xml_parser_init(char * buf, int size, int mode) { xml_parser_mode = mode; } -void xml_parser_free_props(xml_property_t *current_property) { +static void xml_parser_free_props(xml_property_t *current_property) { if (current_property) { if (!current_property->next) { free_xml_property(current_property); @@ -129,7 +129,7 @@ void xml_parser_free_tree(xml_node_t *current_node) { #define STATE_NODE 1 #define STATE_COMMENT 7 -int xml_parser_get_node (xml_node_t *current_node, char *root_name, int rec) { +static int xml_parser_get_node (xml_node_t *current_node, char *root_name, int rec) { char tok[TOKEN_SIZE]; char property_name[TOKEN_SIZE]; char node_name[TOKEN_SIZE]; |