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 | |
| 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')
| -rw-r--r-- | libmpdemux/demux_lavf.c | 6 | ||||
| -rw-r--r-- | libmpdemux/demux_mkv.c | 6 | ||||
| -rw-r--r-- | libmpdemux/demuxer.c | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index 1487a6db6b..79d5a3c420 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -524,8 +524,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, bstr0(filename), + bstr0("application/x-truetype-font"), (struct bstr){codec->extradata, codec->extradata_size}); break; @@ -644,7 +644,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_dict_get(c->metadata, "title", NULL, 0); - demuxer_add_chapter(demuxer, t ? bstr(t->value) : bstr(NULL), + demuxer_add_chapter(demuxer, t ? bstr0(t->value) : bstr0(NULL), start, end); } 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; diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index ea8c4e01f1..453de0b91a 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -1234,7 +1234,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, bstr0(opt), bstr0(param)); } int demux_info_add_bstr(demuxer_t *demuxer, struct bstr opt, struct bstr param) @@ -1244,8 +1244,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, bstr0(info[2*n]))) { + if (!bstrcmp(param, bstr0(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; |