diff options
| author | Uoti Urpala <uau@mplayer2.org> | 2011-07-27 08:38:12 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@mplayer2.org> | 2011-07-27 08:38:12 +0300 |
| commit | 0958620591375b41a8d21dd2a3501e1c9e5e9cba (patch) | |
| tree | bbfcf29330c7408cd1991f3a81138c9bbba81419 /libmpdemux/demux_mkv.c | |
| parent | ea4cc89f36e064b3224d633df8bc08cc49178d51 (diff) | |
| download | mpv-0958620591375b41a8d21dd2a3501e1c9e5e9cba.tar.bz2 mpv-0958620591375b41a8d21dd2a3501e1c9e5e9cba.tar.xz | |
bstr: rename BSTR() -> bstr()
Rename the BSTR() function to bstr(). The former caused a conflict
with some Windows OS name, and it's no longer a macro so uppercase
naming is less appropriate.
Diffstat (limited to 'libmpdemux/demux_mkv.c')
| -rw-r--r-- | libmpdemux/demux_mkv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c index 4b4d8704a5..dadb3887cf 100644 --- a/libmpdemux/demux_mkv.c +++ b/libmpdemux/demux_mkv.c @@ -1619,8 +1619,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, bstr("matroska")) != 0 + && bstrcmp(ebml_master.doc_type, bstr("webm")) != 0) { mp_msg(MSGT_DEMUX, MSGL_DBG2, "[mkv] no head found\n"); talloc_free(parse_ctx.talloc_ctx); return 0; |