Move ass_library initialization code to ass_mp.c.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20518 b3059339-0415-0410-9bf9-f77b7e298cf2

3 files changed, 13 insertions, 8 deletions

diff --git a/libass/ass_mp.c b/libass/ass_mp.c
index 8a03e9cbd9..4695bf6d9e 100644
--- a/libass/ass_mp.c
+++ b/libass/ass_mp.c
@@ -229,3 +229,14 @@ void ass_configure(ass_renderer_t* priv, int w, int h) {
 	free(path);
 	free(family);
 }
+
+ass_library_t* ass_init() {
+  ass_library_t* priv;
+  char* path = get_path("fonts");
+  priv = ass_library_init();
+  ass_set_fonts_dir(priv, path);
+  ass_set_extract_fonts(priv, extract_embedded_fonts);
+  ass_set_style_overrides(priv, ass_force_style_list);
+  free(path);
+  return priv;
+}
diff --git a/libass/ass_mp.h b/libass/ass_mp.h
index c466b47bfe..abe67a9d3c 100644
--- a/libass/ass_mp.h
+++ b/libass/ass_mp.h
@@ -41,6 +41,7 @@ int ass_process_subtitle(ass_track_t* track, subtitle* sub);
 ass_track_t* ass_read_subdata(ass_library_t* library, sub_data* subdata, double fps);
 
 void ass_configure(ass_renderer_t* priv, int w, int h);
+ass_library_t* ass_init();
 
 #endif
 
diff --git a/mplayer.c b/mplayer.c
index 31cd959ea1..167d6df94b 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -3108,14 +3108,7 @@ if(!codecs_file || !parse_codec_cfg(codecs_file)){
   vo_init_osd();
 
 #ifdef USE_ASS
-{
-  char* path = get_path("fonts");
-  ass_library = ass_library_init();
-  ass_set_fonts_dir(ass_library, path);
-  ass_set_extract_fonts(ass_library, extract_embedded_fonts);
-  ass_set_style_overrides(ass_library, ass_force_style_list);
-  free(path);
-}
+  ass_library = ass_init();
 #endif
 
 #ifdef HAVE_RTC