summaryrefslogtreecommitdiffstats
path: root/demux/ebml.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-01-14 17:38:51 +0100
committerwm4 <wm4@nowhere>2014-01-14 17:38:51 +0100
commite32adef9c4775f9bfb696080b17193bbb58db507 (patch)
tree366dd41dc6ed5d9ddafcf6b384867d68bee72ec8 /demux/ebml.h
parentbbbea7934f6c3f1531e000e4b51ff8adcca7923c (diff)
downloadmpv-e32adef9c4775f9bfb696080b17193bbb58db507.tar.bz2
mpv-e32adef9c4775f9bfb696080b17193bbb58db507.tar.xz
ebml: remove length parameters from read functions
Many ebml_read_* functions have a length int pointer parameter, which returns the number of bytes skipped. Nothing actually needed this (anymore), and code using it was rather hard to understand, so get rid of them.
Diffstat (limited to 'demux/ebml.h')
-rw-r--r--demux/ebml.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/demux/ebml.h b/demux/ebml.h
index 80943d33e4..5a0af48e8c 100644
--- a/demux/ebml.h
+++ b/demux/ebml.h
@@ -61,7 +61,6 @@ struct ebml_elem_desc {
struct ebml_parse_ctx {
struct mp_log *log;
void *talloc_ctx;
- int bytes_read;
bool has_errors;
bool no_error_messages;
};
@@ -93,12 +92,12 @@ struct ebml_parse_ctx {
bool ebml_is_mkv_level1_id(uint32_t id);
-uint32_t ebml_read_id (stream_t *s, int *length);
+uint32_t ebml_read_id (stream_t *s);
uint64_t ebml_read_vlen_uint (bstr *buffer);
int64_t ebml_read_vlen_int (bstr *buffer);
-uint64_t ebml_read_length (stream_t *s, int *length);
-uint64_t ebml_read_uint (stream_t *s, uint64_t *length);
-int64_t ebml_read_int (stream_t *s, uint64_t *length);
+uint64_t ebml_read_length (stream_t *s);
+uint64_t ebml_read_uint (stream_t *s);
+int64_t ebml_read_int (stream_t *s);
int ebml_read_skip(struct mp_log *log, int64_t end, stream_t *s);
int ebml_resync_cluster(struct mp_log *log, stream_t *s);