diff options
| author |  diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-08-28 11:20:24 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-08-28 11:20:24 +0000 |
| commit | 84157efa5ac4ee391e8615db69b07027428e331d (patch) | |
| tree | 08118149c7d5e3cf022159765da3f0848da52164 /libvo | |
| parent | 2e2c64dd3adb225800b5bc42cff75cfca67071be (diff) | |
Clean up the way get_path is handled: Compile get_path.c to an object to link
against instead of directly #including the C file and replace the many extern
declarations by a proper header file.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24262 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/font_load.c | 2 | ||||
| -rw-r--r-- | libvo/font_load_ft.c | 3 | ||||
| -rw-r--r-- | libvo/vo_dxr2.c | 3 |
3 files changed, 2 insertions, 6 deletions
diff --git a/libvo/font_load.c b/libvo/font_load.c index b53bbade72..1955e6a596 100644 --- a/libvo/font_load.c +++ b/libvo/font_load.c @@ -10,8 +10,6 @@ #include "font_load.h" #include "mp_msg.h" -extern char *get_path ( char * ); - raw_file* load_raw(char *name,int verbose){ int bpp; raw_file* raw=malloc(sizeof(raw_file)); diff --git a/libvo/font_load_ft.c b/libvo/font_load_ft.c index 97d6cc6a69..773bcd3999 100644 --- a/libvo/font_load_ft.c +++ b/libvo/font_load_ft.c @@ -33,14 +33,13 @@ #include "font_load.h" #include "mp_msg.h" #include "mplayer.h" +#include "get_path.h" #include "osd_font.h" #if (FREETYPE_MAJOR > 2) || (FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 1) #define HAVE_FREETYPE21 #endif -char *get_path(const char *filename); - char *subtitle_font_encoding = NULL; float text_font_scale_factor = 5.0; float osd_font_scale_factor = 6.0; diff --git a/libvo/vo_dxr2.c b/libvo/vo_dxr2.c index 87a5d3fdb3..913400c2b6 100644 --- a/libvo/vo_dxr2.c +++ b/libvo/vo_dxr2.c @@ -18,6 +18,7 @@ #include "mp_msg.h" #include "m_option.h" #include "sub.h" +#include "get_path.h" #include "libmpdemux/mpeg_packetizer.h" #ifdef X11_FULLSCREEN @@ -27,8 +28,6 @@ #include <dxr2ioctl.h> -extern char *get_path(const char *filename); - extern float monitor_aspect; extern float movie_aspect; |