From fcd589b12393614d684c890917f9aac794aa325a Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 24 Jun 2015 14:18:51 +0200 Subject: demux: get rid of some bstr things Change the demuxer_add_attachment() and demuxer_add_chapter() signatures to take char* instead of bstr, and everything which depends on it. --- demux/demux_disc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'demux/demux_disc.c') diff --git a/demux/demux_disc.c b/demux/demux_disc.c index 68ad3817fa..11cbea9361 100644 --- a/demux/demux_disc.c +++ b/demux/demux_disc.c @@ -282,7 +282,7 @@ static void add_stream_chapters(struct demuxer *demuxer) double p = n; if (stream_control(demuxer->stream, STREAM_CTRL_GET_CHAPTER_TIME, &p) < 1) continue; - demuxer_add_chapter(demuxer, bstr0(""), p, 0); + demuxer_add_chapter(demuxer, "", p, 0); } } @@ -301,7 +301,7 @@ static int d_open(demuxer_t *demuxer, enum demux_check check) char *t = NULL; stream_control(demuxer->stream, STREAM_CTRL_GET_DISC_NAME, &t); if (t) { - mp_tags_set_bstr(demuxer->metadata, bstr0("TITLE"), bstr0(t)); + mp_tags_set_str(demuxer->metadata, "TITLE", t); talloc_free(t); } -- cgit v1.2.3