diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-28 00:56:26 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-28 00:56:26 +0200 |
commit | c710c5ee504530eeb7ef7c73f6665fdb291dd206 (patch) | |
tree | 7150c1cee52a18db270877ae384290274a129cd2 /libmpdemux/demuxer.c | |
parent | d84685ce13c7b31689b257e44b780373c91f8d32 (diff) | |
parent | 55c50b3f9931095f7420ce6932329eceaf81d347 (diff) | |
download | mpv-c710c5ee504530eeb7ef7c73f6665fdb291dd206.tar.bz2 mpv-c710c5ee504530eeb7ef7c73f6665fdb291dd206.tar.xz |
Merge branch 'matroska'
Diffstat (limited to 'libmpdemux/demuxer.c')
-rw-r--r-- | libmpdemux/demuxer.c | 57 |
1 files changed, 24 insertions, 33 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 80d4b556b3..5ec705af32 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -394,19 +394,6 @@ void free_demuxer(demuxer_t *demuxer) free(demuxer->info); } free(demuxer->filename); - if (demuxer->chapters) { - for (i = 0; i < demuxer->num_chapters; i++) - free(demuxer->chapters[i].name); - free(demuxer->chapters); - } - if (demuxer->attachments) { - for (i = 0; i < demuxer->num_attachments; i++) { - free(demuxer->attachments[i].name); - free(demuxer->attachments[i].type); - free(demuxer->attachments[i].data); - } - free(demuxer->attachments); - } if (demuxer->teletext) teletext_control(demuxer->teletext, TV_VBI_CONTROL_STOP, NULL); talloc_free(demuxer); @@ -1455,41 +1442,45 @@ int demuxer_switch_video(demuxer_t *demuxer, int index) } int demuxer_add_attachment(demuxer_t *demuxer, const char *name, - const char *type, const void *data, size_t size) + int name_maxlen, const char *type, int type_maxlen, + const void *data, size_t size) { - if (!(demuxer->num_attachments & 31)) - demuxer->attachments = realloc(demuxer->attachments, - (demuxer->num_attachments + 32) * sizeof(demux_attachment_t)); - - demuxer->attachments[demuxer->num_attachments].name = strdup(name); - demuxer->attachments[demuxer->num_attachments].type = strdup(type); - demuxer->attachments[demuxer->num_attachments].data = malloc(size); - memcpy(demuxer->attachments[demuxer->num_attachments].data, data, size); - demuxer->attachments[demuxer->num_attachments].data_size = size; + if (!(demuxer->num_attachments % 32)) + demuxer->attachments = talloc_realloc(demuxer, demuxer->attachments, + struct demux_attachment, + demuxer->num_attachments + 32); + + struct demux_attachment *att = + demuxer->attachments + demuxer->num_attachments; + att->name = talloc_strndup(demuxer->attachments, name, name_maxlen); + att->type = talloc_strndup(demuxer->attachments, type, type_maxlen); + att->data = talloc_size(demuxer->attachments, size); + memcpy(att->data, data, size); + att->data_size = size; return demuxer->num_attachments++; } -int demuxer_add_chapter(demuxer_t *demuxer, const char *name, uint64_t start, - uint64_t end) +int demuxer_add_chapter(demuxer_t *demuxer, const char *name, int name_maxlen, + uint64_t start, uint64_t end) { - if (demuxer->chapters == NULL) - demuxer->chapters = malloc(32 * sizeof(*demuxer->chapters)); - else if (!(demuxer->num_chapters % 32)) - demuxer->chapters = realloc(demuxer->chapters, - (demuxer->num_chapters + 32) * - sizeof(*demuxer->chapters)); + if (!(demuxer->num_chapters % 32)) + demuxer->chapters = talloc_realloc(demuxer, demuxer->chapters, + struct demux_chapter, + demuxer->num_chapters + 32); demuxer->chapters[demuxer->num_chapters].start = start; demuxer->chapters[demuxer->num_chapters].end = end; - demuxer->chapters[demuxer->num_chapters].name = strdup(name ? name : mp_gtext("unknown")); + demuxer->chapters[demuxer->num_chapters].name = name ? + talloc_strndup(demuxer->chapters, name, name_maxlen) : + talloc_strdup(demuxer->chapters, mp_gtext("unknown")); mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CHAPTER_ID=%d\n", demuxer->num_chapters); mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CHAPTER_%d_START=%"PRIu64"\n", demuxer->num_chapters, start); if (end) mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CHAPTER_%d_END=%"PRIu64"\n", demuxer->num_chapters, end); if (name) - mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CHAPTER_%d_NAME=%s\n", demuxer->num_chapters, name); + mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CHAPTER_%d_NAME=%.*s\n", demuxer->num_chapters, name_maxlen, name); return demuxer->num_chapters++; } |