Mercurial > mplayer.hg

comparison libass/ass_mp.c @ 32195:25bb8d59af90

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Unconditionally #include subreader.h. This fixes compilation with iconv disabled.
author diego
date Thu, 16 Sep 2010 19:19:13 +0000
parents 7773438f5abf
children
comparison
equal deleted inserted replaced
32194:26f7bcb5fd7f 32195:25bb8d59af90
23 #include <stdlib.h> 23 #include <stdlib.h>
24 24
25 #include "mp_msg.h" 25 #include "mp_msg.h"
26 #include "mpcommon.h" 26 #include "mpcommon.h"
27 #include "path.h" 27 #include "path.h"
28 #include "subreader.h"
28 29
29 #include "ass_mp.h" 30 #include "ass_mp.h"
30 #include "help_mp.h" 31 #include "help_mp.h"
31 #include "libvo/font_load.h" 32 #include "libvo/font_load.h"
32 #include "stream/stream.h" 33 #include "stream/stream.h"
47 int ass_use_margins = 0; 48 int ass_use_margins = 0;
48 char* ass_color = NULL; 49 char* ass_color = NULL;
49 char* ass_border_color = NULL; 50 char* ass_border_color = NULL;
50 char* ass_styles_file = NULL; 51 char* ass_styles_file = NULL;
51 int ass_hinting = ASS_HINTING_NATIVE + 4; // native hinting for unscaled osd 52 int ass_hinting = ASS_HINTING_NATIVE + 4; // native hinting for unscaled osd
52
53 #ifdef CONFIG_ICONV
54 #include "subreader.h"
55 #else
56 static char* sub_cp = 0;
57 #endif
58 53
59 ASS_Track* ass_default_track(ASS_Library* library) { 54 ASS_Track* ass_default_track(ASS_Library* library) {
60 ASS_Track* track = ass_new_track(library); 55 ASS_Track* track = ass_new_track(library);
61 56
62 track->track_type = TRACK_TYPE_ASS; 57 track->track_type = TRACK_TYPE_ASS;