diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2011-01-20 18:47:18 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2011-01-26 20:39:04 +0200 |
commit | a248c2c7a137517061e6271f22b84d43bcd7191d (patch) | |
tree | 27cb0970881007be820e8dfb74c504cf257afb20 /mplayer.c | |
parent | 966340b31a7bc53e922118da1cd4783d6a06483d (diff) | |
download | mpv-a248c2c7a137517061e6271f22b84d43bcd7191d.tar.bz2 mpv-a248c2c7a137517061e6271f22b84d43bcd7191d.tar.xz |
cleanup: rename ass_* functions to mp_ass_*
The various ass_* functions were created when libass was part of the
MPlayer tree and the distinction between MPlayer-specific and other
functions was less clear. Now that libass is a clearly separate
library, using the same ass_* namespace for player functions is ugly.
Rename the functions to use mp_ass_ prefix instead.
Diffstat (limited to 'mplayer.c')
-rw-r--r-- | mplayer.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1100,15 +1100,15 @@ void add_subtitles(struct MPContext *mpctx, char *filename, float fps, int noerr #ifdef CONFIG_ASS if (opts->ass_enabled) { #ifdef CONFIG_ICONV - asst = ass_read_stream(ass_library, filename, sub_cp); + asst = mp_ass_read_stream(ass_library, filename, sub_cp); #else - asst = ass_read_stream(ass_library, filename, 0); + asst = mp_ass_read_stream(ass_library, filename, 0); #endif is_native_ass = asst; if (!asst) { subd = sub_read_file(filename, fps, &mpctx->opts); if (subd) { - asst = ass_read_subdata(ass_library, subd, fps); + asst = mp_ass_read_subdata(ass_library, subd, fps); sub_free(subd); subd = NULL; } @@ -4091,7 +4091,7 @@ if(!codecs_file || !parse_codec_cfg(codecs_file)){ #endif #ifdef CONFIG_ASS - ass_library = ass_init(); + ass_library = mp_ass_init(); #endif #ifdef HAVE_RTC |