summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_mkv.c
diff options
context:
space:
mode:
authorAnton Khirnov <wyskas@gmail.com>2010-05-19 12:44:37 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-05-22 06:40:28 +0300
commitbc072fb7dc314710aa8c822b400efa3072b8c6ad (patch)
tree3c6ca55fa7931d08f98f5ef518eb05178b0fe10a /libmpdemux/demux_mkv.c
parent9f508dab976b0e4cf43da8b9ef31de357ef76d2f (diff)
downloadmpv-bc072fb7dc314710aa8c822b400efa3072b8c6ad.tar.bz2
mpv-bc072fb7dc314710aa8c822b400efa3072b8c6ad.tar.xz
demux: use bstr arguments for demuxer_add_attachment() and demuxer_add_chapter()
Diffstat (limited to 'libmpdemux/demux_mkv.c')
-rw-r--r--libmpdemux/demux_mkv.c12
1 files changed, 4 insertions, 8 deletions
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: