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 /libmpdemux/demux_mkv.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 'libmpdemux/demux_mkv.c')
| -rw-r--r-- | libmpdemux/demux_mkv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c index b0f45758d7..bcc01fcc0f 100644 --- a/libmpdemux/demux_mkv.c +++ b/libmpdemux/demux_mkv.c @@ -1373,7 +1373,7 @@ static int demux_mkv_open_audio(demuxer_t *demuxer, mkv_track_t *track, if (t->id == NULL) goto error; if (t->prefix) { - if (!bstr_startswith0(bstr(track->codec_id), t->id)) + if (!bstr_startswith0(bstr0(track->codec_id), t->id)) continue; } else { if (strcmp(track->codec_id, t->id)) @@ -1633,8 +1633,8 @@ static int demux_mkv_open(demuxer_t *demuxer) if (ebml_master.doc_type.start == NULL) { mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] File has EBML header but no doctype." " Assuming \"matroska\".\n"); - } else if (bstrcmp(ebml_master.doc_type, bstr("matroska")) != 0 - && bstrcmp(ebml_master.doc_type, bstr("webm")) != 0) { + } else if (bstrcmp(ebml_master.doc_type, bstr0("matroska")) != 0 + && bstrcmp(ebml_master.doc_type, bstr0("webm")) != 0) { mp_msg(MSGT_DEMUX, MSGL_DBG2, "[mkv] no head found\n"); talloc_free(parse_ctx.talloc_ctx); return 0; |