From 0958620591375b41a8d21dd2a3501e1c9e5e9cba Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Wed, 27 Jul 2011 08:38:12 +0300 Subject: 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. --- libmpdemux/demux_mkv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libmpdemux/demux_mkv.c') 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; -- cgit v1.2.3