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 | |
| 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')
| -rw-r--r-- | libmpdemux/demux_lavf.c | 6 | ||||
| -rw-r--r-- | libmpdemux/demux_mkv.c | 4 | ||||
| -rw-r--r-- | libmpdemux/demuxer.c | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index 545e3bdace..2da898bf5c 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -503,8 +503,8 @@ static void handle_stream(demuxer_t *demuxer, AVFormatContext *avfc, int i) NULL, 0); char *filename = ftag ? ftag->value : NULL; if (st->codec->codec_id == CODEC_ID_TTF) - demuxer_add_attachment(demuxer, BSTR(filename), - BSTR("application/x-truetype-font"), + demuxer_add_attachment(demuxer, bstr(filename), + bstr("application/x-truetype-font"), (struct bstr){codec->extradata, codec->extradata_size}); break; @@ -630,7 +630,7 @@ static demuxer_t *demux_open_lavf(demuxer_t *demuxer) uint64_t end = av_rescale_q(c->end, c->time_base, (AVRational){1, 1000000000}); t = av_metadata_get(c->metadata, "title", NULL, 0); - demuxer_add_chapter(demuxer, t ? BSTR(t->value) : BSTR(NULL), + demuxer_add_chapter(demuxer, t ? bstr(t->value) : bstr(NULL), start, end); } 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; diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 276d62dbae..9aaed21a8f 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -1227,7 +1227,7 @@ int demux_seek(demuxer_t *demuxer, float rel_seek_secs, float audio_delay, int demux_info_add(demuxer_t *demuxer, const char *opt, const char *param) { - return demux_info_add_bstr(demuxer, BSTR(opt), BSTR(param)); + return demux_info_add_bstr(demuxer, bstr(opt), bstr(param)); } int demux_info_add_bstr(demuxer_t *demuxer, struct bstr opt, struct bstr param) @@ -1237,8 +1237,8 @@ int demux_info_add_bstr(demuxer_t *demuxer, struct bstr opt, struct bstr param) for (n = 0; info && info[2 * n] != NULL; n++) { - if (!bstrcasecmp(opt, BSTR(info[2*n]))) { - if (!bstrcmp(param, BSTR(info[2*n + 1]))) { + if (!bstrcasecmp(opt, bstr(info[2*n]))) { + if (!bstrcmp(param, bstr(info[2*n + 1]))) { mp_msg(MSGT_DEMUX, MSGL_V, "Demuxer info %.*s set to unchanged value %.*s\n", BSTR_P(opt), BSTR_P(param)); return 0; |