summaryrefslogtreecommitdiffstats
path: root/timeline/tl_matroska.c
diff options
context:
space:
mode:
authorwm4 <wm4@mplayer2.org>2012-07-28 23:47:42 +0200
committerwm4 <wm4@mplayer2.org>2012-07-28 23:47:42 +0200
commit08caadb9c0b3c9070f2e5cb7f883f43d6cd5590e (patch)
treee6a6c3a2042231651ec2f622e312657da900280b /timeline/tl_matroska.c
parentca0979a5db442ae212c92a34dcbd97101eb5e51c (diff)
downloadmpv-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 'timeline/tl_matroska.c')
-rw-r--r--timeline/tl_matroska.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/timeline/tl_matroska.c b/timeline/tl_matroska.c
index 09f86b8284..562b1bda1f 100644
--- a/timeline/tl_matroska.c
+++ b/timeline/tl_matroska.c
@@ -82,7 +82,7 @@ static char **find_files(const char *original_file, const char *suffix)
if (!strcmp(ep->d_name, basename))
continue;
- char *name = mp_path_join(results, directory, bstr(ep->d_name));
+ char *name = mp_path_join(results, directory, bstr0(ep->d_name));
char *s1 = ep->d_name;
char *s2 = basename;
int matchlen = 0;