Mercurial > mplayer.hg
changeset 30556:358ac046eccc
libvo: Mark functions not used outside of their files as static.
| author | diego |
|---|---|
| date | Tue, 16 Feb 2010 16:22:17 +0000 |
| parents | ad6740b58b0d |
| children | 74a6c2a3dcce |
| files | libvo/spuenc.c libvo/sub.c libvo/vo_aa.c libvo/vo_directfb2.c libvo/vo_mpegpes.c libvo/vo_s3fb.c libvo/vo_zr.c libvo/x11_common.c |
| diffstat | 8 files changed, 43 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/spuenc.c Tue Feb 16 16:16:42 2010 +0000 +++ b/libvo/spuenc.c Tue Feb 16 16:22:17 2010 +0000 @@ -231,7 +231,7 @@ } -void +static void pixbuf_load_xpm( pixbuf* pb, char* xpm[] ) { int colors, chrs, l, n; char c[4], table[256]; @@ -271,7 +271,7 @@ } } -void +static void pixbuf_delete( pixbuf* pb ) { free( pb->pixels ); }
--- a/libvo/sub.c Tue Feb 16 16:16:42 2010 +0000 +++ b/libvo/sub.c Tue Feb 16 16:22:17 2010 +0000 @@ -1090,8 +1090,10 @@ #define FONT_LOAD_DEFER 6 -int vo_update_osd_ext(int dxs,int dys, int left_border, int top_border, - int right_border, int bottom_border, int orig_w, int orig_h){ +static int vo_update_osd_ext(int dxs,int dys, int left_border, int top_border, + int right_border, int bottom_border, int orig_w, + int orig_h) +{ mp_osd_obj_t* obj=vo_osd_list; int chg=0; #ifdef CONFIG_FREETYPE
--- a/libvo/vo_aa.c Tue Feb 16 16:16:42 2010 +0000 +++ b/libvo/vo_aa.c Tue Feb 16 16:22:17 2010 +0000 @@ -96,7 +96,7 @@ int aaopt_osdcolor = AA_SPECIAL; int aaopt_subcolor = AA_SPECIAL; -void +static void resize(void){ /* * this function is called by aa lib if windows resizes
--- a/libvo/vo_directfb2.c Tue Feb 16 16:16:42 2010 +0000 +++ b/libvo/vo_directfb2.c Tue Feb 16 16:22:17 2010 +0000 @@ -138,7 +138,8 @@ * implementation * ******************************/ -void unlock(void) { +static void unlock(void) +{ if (frame && framelocked) frame->Unlock(frame); if (primary && primarylocked) primary->Unlock(primary); } @@ -310,7 +311,7 @@ } -DFBSurfacePixelFormat convformat(uint32_t format) +static DFBSurfacePixelFormat convformat(uint32_t format) { // add more formats !!! switch (format) { @@ -350,9 +351,9 @@ int setsize; } enum1_t; -DFBEnumerationResult test_format_callback( unsigned int id, - DFBDisplayLayerDescription desc, - void *data) +static DFBEnumerationResult test_format_callback(unsigned int id, + DFBDisplayLayerDescription desc, + void *data) { enum1_t *params =(enum1_t *)data; IDirectFBDisplayLayer *layer; @@ -448,7 +449,8 @@ } videomode_t; -DFBEnumerationResult video_modes_callback( int width,int height,int bpp, void *data) +static DFBEnumerationResult video_modes_callback(int width, int height, + int bpp, void *data) { videomode_t *params =(videomode_t *)data;
--- a/libvo/vo_mpegpes.c Tue Feb 16 16:16:42 2010 +0000 +++ b/libvo/vo_mpegpes.c Tue Feb 16 16:22:17 2010 +0000 @@ -220,11 +220,14 @@ return orig_len; } -void send_pes_packet(unsigned char* data,int len,int id,int timestamp){ +static void send_pes_packet(unsigned char* data, int len, int id, int timestamp) +{ send_mpeg_pes_packet (data, len, id, timestamp, 1, my_write); } -void send_lpcm_packet(unsigned char* data,int len,int id,unsigned int timestamp,int freq_id){ +static void send_lpcm_packet(unsigned char* data, int len, int id, + unsigned int timestamp, int freq_id) +{ send_mpeg_lpcm_packet(data, len, id, timestamp, freq_id, my_write); }
--- a/libvo/vo_s3fb.c Tue Feb 16 16:16:42 2010 +0000 +++ b/libvo/vo_s3fb.c Tue Feb 16 16:22:17 2010 +0000 @@ -105,18 +105,21 @@ #define OUTREG(mmreg, value) *(unsigned int *)(&v->mmio[mmreg]) = value -int readcrtc(int reg) { +static int readcrtc(int reg) +{ outb(reg, 0x3d4); return inb(0x3d5); } -void writecrtc(int reg, int value) { +static void writecrtc(int reg, int value) +{ outb(reg, 0x3d4); outb(value, 0x3d5); } // enable S3 registers -int enable(void) { +static int enable(void) +{ int fd; if (v) @@ -148,7 +151,8 @@ return 0; } -void disable(void) { +static void disable(void) +{ if (v) { writecrtc(0x53, v->cr53); writecrtc(0x39, v->cr39); @@ -160,7 +164,10 @@ } } -int yuv_on(int format, int src_w, int src_h, int dst_x, int dst_y, int dst_w, int dst_h, int crop, int xres, int yres, int line_length, int offset) { +static int yuv_on(int format, int src_w, int src_h, int dst_x, int dst_y, + int dst_w, int dst_h, int crop, int xres, int yres, + int line_length, int offset) +{ int tmp, pitch, start, src_wc, src_hc, bpp; if (format == 0 || format == 7) @@ -227,7 +234,8 @@ return offset; } -void yuv_off(void) { +static void yuv_off(void) +{ writecrtc(0x67, readcrtc(0x67) & ~0xc); memset(v->mmio + 0x8180, 0, 0x80); OUTREG(0x81b8, 0x900);
--- a/libvo/vo_zr.c Tue Feb 16 16:16:42 2010 +0000 +++ b/libvo/vo_zr.c Tue Feb 16 16:22:17 2010 +0000 @@ -121,7 +121,8 @@ #define MJPEG_SIZE 1024*256 -int zoran_getcap(zr_info_t *zr) { +static int zoran_getcap(zr_info_t *zr) +{ char* dev = NULL; if (zr->device) @@ -196,7 +197,8 @@ return 0; } -int init_zoran(zr_info_t *zr, int stretchx, int stretchy) { +static int init_zoran(zr_info_t *zr, int stretchx, int stretchy) +{ /* center the image, and stretch it as far as possible (try to keep * aspect) and check if it fits */ if (zr->image_width > zr->vc.maxwidth) { @@ -264,7 +266,8 @@ return 0; } -void uninit_zoran(zr_info_t *zr) { +static void uninit_zoran(zr_info_t *zr) +{ if (zr->image) { free(zr->image); zr->image=NULL; @@ -283,7 +286,8 @@ close(zr->vdes); } -int zr_geometry_sane(geo_t *g, unsigned int width, unsigned int height) { +static int zr_geometry_sane(geo_t *g, unsigned int width, unsigned int height) +{ if (g->set) { if (g->width%2 != 0 || g->height%2 != 0 || g->xoff%2 != 0 || g->yoff%2 != 0) {
--- a/libvo/x11_common.c Tue Feb 16 16:16:42 2010 +0000 +++ b/libvo/x11_common.c Tue Feb 16 16:22:17 2010 +0000 @@ -2122,7 +2122,7 @@ * Outputs the content of |ck_handling| as a readable message. * */ -void vo_xv_print_ck_info(void) +static void vo_xv_print_ck_info(void) { mp_msg( MSGT_VO, MSGL_V, "[xv common] " );