diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-04 01:55:52 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-04 01:55:52 +0200 |
| commit | 8c144171bb80dd3d1f7161b97675e78cad00bc65 (patch) | |
| tree | 7ad930ebc554ab68af1911f4dfd217cc18b86cce /gui/skin/skin.h | |
| parent | 52ee93c1c64dfaa0afc881c38154b04c100cb617 (diff) | |
| parent | 8c5889004f7ba9f6fcbca20a05a9301771348408 (diff) | |
| download | mpv-8c144171bb80dd3d1f7161b97675e78cad00bc65.tar.bz2 mpv-8c144171bb80dd3d1f7161b97675e78cad00bc65.tar.xz | |
Merge svn changes up to r28087
Conflicts:
command.c
libao2/ao_ivtv.c
libao2/ao_v4l2.c
libmpcodecs/dec_video.h
libvo/aspect.h
libvo/sub.c
libvo/sub.h
libvo/vo_directx.c
libvo/vo_macosx.m
libvo/vo_quartz.c
mp_core.h
mplayer.c
mplayer.h
osdep/getch2.h
osdep/timer.h
Diffstat (limited to 'gui/skin/skin.h')
| -rw-r--r-- | gui/skin/skin.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gui/skin/skin.h b/gui/skin/skin.h index 5c8ffefe3f..20005f2ca8 100644 --- a/gui/skin/skin.h +++ b/gui/skin/skin.h @@ -23,13 +23,13 @@ extern listItems * skinAppMPlayer; -extern int skinRead( char * dname ); -extern int skinBPRead( char * fname, txSample * bf ); +int skinRead( char * dname ); +int skinBPRead( char * fname, txSample * bf ); // --- -extern char * trimleft( char * in ); -extern char * strswap( char * in,char what,char whereof ); -extern char * trim( char * in ); +char * trimleft( char * in ); +char * strswap( char * in, char what, char whereof ); +char * trim( char * in ); #endif /* MPLAYER_GUI_SKIN_H */ |