diff options
| author | wm4 <wm4@mplayer2.org> | 2012-07-28 23:47:42 +0200 |
|---|---|---|
| committer | wm4 <wm4@mplayer2.org> | 2012-07-28 23:47:42 +0200 |
| commit | 08caadb9c0b3c9070f2e5cb7f883f43d6cd5590e (patch) | |
| tree | e6a6c3a2042231651ec2f622e312657da900280b /sub/subassconvert.c | |
| parent | ca0979a5db442ae212c92a34dcbd97101eb5e51c (diff) | |
| download | mpv-08caadb9c0b3c9070f2e5cb7f883f43d6cd5590e.tar.bz2 mpv-08caadb9c0b3c9070f2e5cb7f883f43d6cd5590e.tar.xz | |
bstr: rename bstr() function to bstr0(), and typedef bstr to struct bstr
Replace all uses of bstr() with bstr0().
Also remove the ridiculous C++ workaround.
Diffstat (limited to 'sub/subassconvert.c')
| -rw-r--r-- | sub/subassconvert.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sub/subassconvert.c b/sub/subassconvert.c index e1db9bb033..e958bb9d49 100644 --- a/sub/subassconvert.c +++ b/sub/subassconvert.c @@ -215,7 +215,7 @@ void subassconvert_subrip(const char *orig, char *dest, int dest_buffer_size) tag->has_size = true; has_valid_attr = true; } else if (!bstrcmp0(attr, "color")) { - if (bstr_eatstart(&val, bstr("#"))) { + if (bstr_eatstart(&val, bstr0("#"))) { // #RRGGBB format tag->color = bstrtoll(val, &val, 16) & 0x00ffffff; if (val.len) @@ -227,7 +227,7 @@ void subassconvert_subrip(const char *orig, char *dest, int dest_buffer_size) // Standard web colors for (int i = 0; i < FF_ARRAY_ELEMS(subrip_web_colors); i++) { char *color = subrip_web_colors[i].s; - if (bstrcasecmp(val, bstr(color)) == 0) { + if (bstrcasecmp(val, bstr0(color)) == 0) { tag->color = subrip_web_colors[i].v; goto foundcolor; } |