summaryrefslogtreecommitdiffstats
path: root/sub/osd_libass.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-05-03 22:29:12 +0200
committerwm4 <wm4@nowhere>2016-05-03 22:29:12 +0200
commit485ae095f77a27bd3bca08b0e221dff14581e0d3 (patch)
tree01ac35ad2dc75bcc0bbbc9775d8dd8e32f7a523c /sub/osd_libass.c
parent5be40f035b03b5dbc891f463ae90575243adf301 (diff)
downloadmpv-485ae095f77a27bd3bca08b0e221dff14581e0d3.tar.bz2
mpv-485ae095f77a27bd3bca08b0e221dff14581e0d3.tar.xz
osd: make osd_ass_0/1 defines
So we can concatenate them with strings at compile time.
Diffstat (limited to 'sub/osd_libass.c')
-rw-r--r--sub/osd_libass.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/sub/osd_libass.c b/sub/osd_libass.c
index 30d404d8c6..6a2efa6603 100644
--- a/sub/osd_libass.c
+++ b/sub/osd_libass.c
@@ -179,13 +179,10 @@ static void clear_ass(struct ass_state *ass)
void osd_get_function_sym(char *buffer, size_t buffer_size, int osd_function)
{
// 0xFF is never valid UTF-8, so we can use it to escape OSD symbols.
+ // (Same trick as OSD_ASS_0/OSD_ASS_1.)
snprintf(buffer, buffer_size, "\xFF%c", osd_function);
}
-// Same trick as above: never valid UTF-8, so we expect it's free for use.
-const char *const osd_ass_0 = "\xFD";
-const char *const osd_ass_1 = "\xFE";
-
static void mangle_ass(bstr *dst, const char *in)
{
bool escape_ass = true;
@@ -198,8 +195,8 @@ static void mangle_ass(bstr *dst, const char *in)
in += 2;
continue;
}
- if (*in == '\xFD' || *in == '\xFE') {
- escape_ass = *in == '\xFE';
+ if (*in == OSD_ASS_0[0] || *in == OSD_ASS_1[0]) {
+ escape_ass = *in == OSD_ASS_1[0];
in += 1;
continue;
}