summaryrefslogtreecommitdiffstats
path: root/demux/demux_mkv.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-06-24 14:18:51 +0200
committerwm4 <wm4@nowhere>2015-06-24 14:18:51 +0200
commitfcd589b12393614d684c890917f9aac794aa325a (patch)
tree4f878d0389f1baaffa718305966737ccdf5de38b /demux/demux_mkv.c
parentae2873f72e90c948da1ed32af3e30e0cd6cef409 (diff)
downloadmpv-fcd589b12393614d684c890917f9aac794aa325a.tar.bz2
mpv-fcd589b12393614d684c890917f9aac794aa325a.tar.xz
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.
Diffstat (limited to 'demux/demux_mkv.c')
-rw-r--r--demux/demux_mkv.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c
index 9331563e30..d40a65e858 100644
--- a/demux/demux_mkv.c
+++ b/demux/demux_mkv.c
@@ -894,7 +894,7 @@ static int demux_mkv_read_chapters(struct demuxer *demuxer)
name);
if (idx == selected_edition) {
- demuxer_add_chapter(demuxer, bstr0(name), chapter.start / 1e9,
+ demuxer_add_chapter(demuxer, name, chapter.start / 1e9,
ca->chapter_uid);
}
if (m_chapters) {
@@ -996,7 +996,8 @@ static int demux_mkv_read_attachments(demuxer_t *demuxer)
}
char *name = attachment->file_name;
char *mime = attachment->file_mime_type;
- demuxer_add_attachment(demuxer, bstr0(name), bstr0(mime), attachment->file_data);
+ demuxer_add_attachment(demuxer, name, mime, attachment->file_data.start,
+ attachment->file_data.len);
MP_VERBOSE(demuxer, "Attachment: %s, %s, %zu bytes\n",
name, mime, attachment->file_data.len);
}