[MPlayer-cvslog] r30598 - in trunk/libvo: spuenc.c sub.c vo_aa.c vo_directfb2.c vo_mpegpes.c vo_s3fb.c vo_zr.c x11_common.c
diego
subversion at mplayerhq.hu
Tue Feb 16 17:22:17 CET 2010
Author: diego
Date: Tue Feb 16 17:22:17 2010
New Revision: 30598
Log:
libvo: Mark functions not used outside of their files as static.
Modified:
trunk/libvo/spuenc.c
trunk/libvo/sub.c
trunk/libvo/vo_aa.c
trunk/libvo/vo_directfb2.c
trunk/libvo/vo_mpegpes.c
trunk/libvo/vo_s3fb.c
trunk/libvo/vo_zr.c
trunk/libvo/x11_common.c
Modified: trunk/libvo/spuenc.c
==============================================================================
--- trunk/libvo/spuenc.c Tue Feb 16 17:16:42 2010 (r30597)
+++ trunk/libvo/spuenc.c Tue Feb 16 17:22:17 2010 (r30598)
@@ -231,7 +231,7 @@ pixbuf_encode_rle(int x, int y, int w, i
}
-void
+static void
pixbuf_load_xpm( pixbuf* pb, char* xpm[] ) {
int colors, chrs, l, n;
char c[4], table[256];
@@ -271,7 +271,7 @@ pixbuf_load_xpm( pixbuf* pb, char* xpm[]
}
}
-void
+static void
pixbuf_delete( pixbuf* pb ) {
free( pb->pixels );
}
Modified: trunk/libvo/sub.c
==============================================================================
--- trunk/libvo/sub.c Tue Feb 16 17:16:42 2010 (r30597)
+++ trunk/libvo/sub.c Tue Feb 16 17:22:17 2010 (r30598)
@@ -1090,8 +1090,10 @@ void free_osd_list(void){
#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
Modified: trunk/libvo/vo_aa.c
==============================================================================
--- trunk/libvo/vo_aa.c Tue Feb 16 17:16:42 2010 (r30597)
+++ trunk/libvo/vo_aa.c Tue Feb 16 17:22:17 2010 (r30598)
@@ -96,7 +96,7 @@ static struct SwsContext *sws=NULL;
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
Modified: trunk/libvo/vo_directfb2.c
==============================================================================
--- trunk/libvo/vo_directfb2.c Tue Feb 16 17:16:42 2010 (r30597)
+++ trunk/libvo/vo_directfb2.c Tue Feb 16 17:22:17 2010 (r30598)
@@ -138,7 +138,8 @@ static int field_parity = -1;
* implementation *
******************************/
-void unlock(void) {
+static void unlock(void)
+{
if (frame && framelocked) frame->Unlock(frame);
if (primary && primarylocked) primary->Unlock(primary);
}
@@ -310,7 +311,7 @@ static int preinit(const char *arg)
}
-DFBSurfacePixelFormat convformat(uint32_t format)
+static DFBSurfacePixelFormat convformat(uint32_t format)
{
// add more formats !!!
switch (format) {
@@ -350,9 +351,9 @@ unsigned int height;
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 @@ int bpp;
} 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;
Modified: trunk/libvo/vo_mpegpes.c
==============================================================================
--- trunk/libvo/vo_mpegpes.c Tue Feb 16 17:16:42 2010 (r30597)
+++ trunk/libvo/vo_mpegpes.c Tue Feb 16 17:22:17 2010 (r30598)
@@ -220,11 +220,14 @@ static int my_write(unsigned char* data,
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);
}
Modified: trunk/libvo/vo_s3fb.c
==============================================================================
--- trunk/libvo/vo_s3fb.c Tue Feb 16 17:16:42 2010 (r30597)
+++ trunk/libvo/vo_s3fb.c Tue Feb 16 17:22:17 2010 (r30598)
@@ -105,18 +105,21 @@ static void clear_screen(void);
#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 @@ int enable(void) {
return 0;
}
-void disable(void) {
+static void disable(void)
+{
if (v) {
writecrtc(0x53, v->cr53);
writecrtc(0x39, v->cr39);
@@ -160,7 +164,10 @@ void disable(void) {
}
}
-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 @@ int yuv_on(int format, int src_w, int sr
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);
Modified: trunk/libvo/vo_zr.c
==============================================================================
--- trunk/libvo/vo_zr.c Tue Feb 16 17:16:42 2010 (r30597)
+++ trunk/libvo/vo_zr.c Tue Feb 16 17:22:17 2010 (r30598)
@@ -121,7 +121,8 @@ static zr_info_t zr_info[ZR_MAX_DEVICES]
#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 @@ int zoran_getcap(zr_info_t *zr) {
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 @@ int init_zoran(zr_info_t *zr, int stretc
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 @@ void uninit_zoran(zr_info_t *zr) {
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) {
Modified: trunk/libvo/x11_common.c
==============================================================================
--- trunk/libvo/x11_common.c Tue Feb 16 17:16:42 2010 (r30597)
+++ trunk/libvo/x11_common.c Tue Feb 16 17:22:17 2010 (r30598)
@@ -2122,7 +2122,7 @@ void vo_xv_get_max_img_dim( uint32_t * w
* 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] " );
More information about the MPlayer-cvslog
mailing list