From bc072fb7dc314710aa8c822b400efa3072b8c6ad Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Wed, 19 May 2010 12:44:37 +0200 Subject: demux: use bstr arguments for demuxer_add_attachment() and demuxer_add_chapter() --- libmpdemux/demux_mkv.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'libmpdemux/demux_mkv.c') diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c index 0a63df400e..9a5c5eceb2 100644 --- a/libmpdemux/demux_mkv.c +++ b/libmpdemux/demux_mkv.c @@ -865,8 +865,7 @@ static int demux_mkv_read_chapters(struct demuxer *demuxer) BSTR_P(name)); if (idx == selected_edition){ - demuxer_add_chapter(demuxer, name.start, name.len, - chapter.start, chapter.end); + demuxer_add_chapter(demuxer, name, chapter.start, chapter.end); if (editions[idx].edition_flag_ordered) { chapter.name = talloc_strndup(m_chapters, name.start, name.len); @@ -915,12 +914,9 @@ static int demux_mkv_read_attachments(demuxer_t *demuxer) } struct bstr name = attachment->file_name; struct bstr mime = attachment->file_mime_type; - char *data = attachment->file_data.start; - int data_size = attachment->file_data.len; - demuxer_add_attachment(demuxer, name.start, name.len, mime.start, - mime.len, data, data_size); - mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] Attachment: %.*s, %.*s, %u bytes\n", - BSTR_P(name), BSTR_P(mime), data_size); + demuxer_add_attachment(demuxer, name, mime, attachment->file_data); + mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] Attachment: %.*s, %.*s, %zu bytes\n", + BSTR_P(name), BSTR_P(mime), attachment->file_data.len); } out: -- cgit v1.2.3