[MPlayer-cvslog] r18955 - in trunk/libvo: font_load_ft.c sub.c vo_aa.c vo_jpeg.c vo_md5sum.c vo_png.c vo_pnm.c vo_svga.c x11_common.c
uau
subversion at mplayerhq.hu
Sat Jul 8 17:26:37 CEST 2006
Author: uau
Date: Sat Jul 8 17:26:36 2006
New Revision: 18955
Modified:
trunk/libvo/font_load_ft.c
trunk/libvo/sub.c
trunk/libvo/vo_aa.c
trunk/libvo/vo_jpeg.c
trunk/libvo/vo_md5sum.c
trunk/libvo/vo_png.c
trunk/libvo/vo_pnm.c
trunk/libvo/vo_svga.c
trunk/libvo/x11_common.c
Log:
Make some functions static.
Patch by Stefan Huehner, stefan at huehner org.
Modified: trunk/libvo/font_load_ft.c
==============================================================================
--- trunk/libvo/font_load_ft.c (original)
+++ trunk/libvo/font_load_ft.c Sat Jul 8 17:26:36 2006
@@ -234,7 +234,7 @@
}
// general outline
-void outline(
+static void outline(
unsigned char *s,
unsigned char *t,
int width,
@@ -277,7 +277,7 @@
// 1 pixel outline
-void outline1(
+static void outline1(
unsigned char *s,
unsigned char *t,
int width,
@@ -315,7 +315,7 @@
}
// "0 pixel outline"
-void outline0(
+static void outline0(
unsigned char *s,
unsigned char *t,
int width,
@@ -330,7 +330,7 @@
}
// gaussian blur
-void blur(
+static void blur(
unsigned char *buffer,
unsigned short *tmp2,
int width,
@@ -654,7 +654,7 @@
}
-int generate_tables(font_desc_t *desc, double thickness, double radius)
+static int generate_tables(font_desc_t *desc, double thickness, double radius)
{
int width = desc->max_height;
int height = desc->max_width;
Modified: trunk/libvo/sub.c
==============================================================================
--- trunk/libvo/sub.c (original)
+++ trunk/libvo/sub.c Sat Jul 8 17:26:36 2006
@@ -765,7 +765,7 @@
mp_osd_obj_t* vo_osd_list=NULL;
-mp_osd_obj_t* new_osd_obj(int type){
+static mp_osd_obj_t* new_osd_obj(int type){
mp_osd_obj_t* osd=malloc(sizeof(mp_osd_obj_t));
memset(osd,0,sizeof(mp_osd_obj_t));
osd->next=vo_osd_list;
Modified: trunk/libvo/vo_aa.c
==============================================================================
--- trunk/libvo/vo_aa.c (original)
+++ trunk/libvo/vo_aa.c Sat Jul 8 17:26:36 2006
@@ -136,8 +136,8 @@
}
-void
-osdmessage(int duration, int deko, char *fmt, ...)
+static void
+osdmessage(int duration, int deko, const char *fmt, ...)
{
/*
* for outputting a centered string at the bottom
@@ -163,8 +163,8 @@
posbar[0]='\0';
}
-void
-osdpercent(int duration, int deko, int min, int max, int val, char * desc, char * unit)
+static void
+osdpercent(int duration, int deko, int min, int max, int val, const char * desc, const char * unit)
{
/*
* prints a bar for setting values
@@ -190,7 +190,7 @@
}
-void
+static void
printosdtext(void)
{
if(osd_text_length > 0 && !vo_osd_text) {
@@ -220,7 +220,7 @@
}
}
-void
+static void
printosdprogbar(void){
/* print mplayer osd-progbar */
if (vo_osd_progbar_type!=-1){
@@ -574,7 +574,7 @@
#endif
}
-int
+static int
getcolor(char * s){
int i;
char * rest;
Modified: trunk/libvo/vo_jpeg.c
==============================================================================
--- trunk/libvo/vo_jpeg.c (original)
+++ trunk/libvo/vo_jpeg.c Sat Jul 8 17:26:36 2006
@@ -98,7 +98,7 @@
* returns, everything went well.
*/
-void jpeg_mkdir(char *buf, int verbose) {
+static void jpeg_mkdir(char *buf, int verbose) {
struct stat stat_p;
#ifndef __MINGW32__
Modified: trunk/libvo/vo_md5sum.c
==============================================================================
--- trunk/libvo/vo_md5sum.c (original)
+++ trunk/libvo/vo_md5sum.c Sat Jul 8 17:26:36 2006
@@ -85,7 +85,7 @@
* \return nothing It does not return.
*/
-void md5sum_write_error(void) {
+static void md5sum_write_error(void) {
mp_msg(MSGT_VO, MSGL_ERR, MSGTR_ErrorWritingFile, info.short_name);
exit_player(MSGTR_Exit_error);
}
Modified: trunk/libvo/vo_png.c
==============================================================================
--- trunk/libvo/vo_png.c (original)
+++ trunk/libvo/vo_png.c Sat Jul 8 17:26:36 2006
@@ -59,7 +59,7 @@
}
-struct pngdata create_png (char * fname, int image_width, int image_height, int swapped)
+static struct pngdata create_png (char * fname, int image_width, int image_height, int swapped)
{
struct pngdata png;
Modified: trunk/libvo/vo_pnm.c
==============================================================================
--- trunk/libvo/vo_pnm.c (original)
+++ trunk/libvo/vo_pnm.c Sat Jul 8 17:26:36 2006
@@ -96,7 +96,7 @@
* \return nothing It does not return.
*/
-void pnm_write_error(void) {
+static void pnm_write_error(void) {
mp_msg(MSGT_VO, MSGL_ERR, MSGTR_ErrorWritingFile, info.short_name);
exit_player(MSGTR_Exit_error);
}
@@ -197,7 +197,7 @@
* returns, everything went well.
*/
-void pnm_mkdir(char *buf, int verbose) {
+static void pnm_mkdir(char *buf, int verbose) {
struct stat stat_p;
/* Silly MING32 bug workaround */
@@ -298,7 +298,7 @@
* \return none The player will exit if anything goes wrong.
*/
-void pnm_write_pnm(FILE *outfile, mp_image_t *mpi)
+static void pnm_write_pnm(FILE *outfile, mp_image_t *mpi)
{
uint32_t w = mpi->w;
uint32_t h = mpi->h;
@@ -433,7 +433,7 @@
* \return none The player will exit if anything goes wrong.
*/
-void pnm_write_image(mp_image_t *mpi)
+static void pnm_write_image(mp_image_t *mpi)
{
static int framenum = 0, framecounter = 0, subdircounter = 0;
char buf[BUFLENGTH];
Modified: trunk/libvo/vo_svga.c
==============================================================================
--- trunk/libvo/vo_svga.c (original)
+++ trunk/libvo/vo_svga.c Sat Jul 8 17:26:36 2006
@@ -303,7 +303,7 @@
return VO_TRUE;
}
-int bpp_from_vminfo(vga_modeinfo *vminfo){
+static int bpp_from_vminfo(vga_modeinfo *vminfo){
switch(vminfo->colors){
case 2: return 1;
case 16: return 4;
@@ -315,7 +315,7 @@
return 0;
}
-int find_best_svga_mode(int req_w,int req_h, int req_bpp){
+static int find_best_svga_mode(int req_w,int req_h, int req_bpp){
int badness,prev_badness;
int bestmode,lastmode;
int i;
Modified: trunk/libvo/x11_common.c
==============================================================================
--- trunk/libvo/x11_common.c (original)
+++ trunk/libvo/x11_common.c Sat Jul 8 17:26:36 2006
@@ -559,7 +559,7 @@
extern void mplayer_put_key(int code);
#ifdef XF86XK_AudioPause
-void vo_x11_putkey_ext(int keysym)
+static void vo_x11_putkey_ext(int keysym)
{
switch (keysym)
{
More information about the MPlayer-cvslog
mailing list