summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demuxer.h
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-01-28 00:56:26 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-01-28 00:56:26 +0200
commitc710c5ee504530eeb7ef7c73f6665fdb291dd206 (patch)
tree7150c1cee52a18db270877ae384290274a129cd2 /libmpdemux/demuxer.h
parentd84685ce13c7b31689b257e44b780373c91f8d32 (diff)
parent55c50b3f9931095f7420ce6932329eceaf81d347 (diff)
downloadmpv-c710c5ee504530eeb7ef7c73f6665fdb291dd206.tar.bz2
mpv-c710c5ee504530eeb7ef7c73f6665fdb291dd206.tar.xz
Merge branch 'matroska'
Diffstat (limited to 'libmpdemux/demuxer.h')
-rw-r--r--libmpdemux/demuxer.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h
index c5499bd053..def50af23e 100644
--- a/libmpdemux/demuxer.h
+++ b/libmpdemux/demuxer.h
@@ -453,10 +453,11 @@ int demuxer_type_by_filename(char* filename);
void demuxer_help(void);
int get_demuxer_type_from_name(char *demuxer_name, int *force);
-int demuxer_add_attachment(demuxer_t* demuxer, const char* name,
- const char* type, const void* data, size_t size);
-
-int demuxer_add_chapter(demuxer_t* demuxer, const char* name, uint64_t start, uint64_t end);
+int demuxer_add_attachment(demuxer_t *demuxer, const char *name,
+ int name_maxlen, const char *type, int type_maxlen,
+ const void *data, size_t size);
+int demuxer_add_chapter(demuxer_t *demuxer, const char *name, int name_maxlen,
+ uint64_t start, uint64_t end);
int demuxer_seek_chapter(demuxer_t *demuxer, int chapter, double *seek_pts,
char **chapter_name);