diff options
| author | wm4 <wm4@nowhere> | 2013-12-21 23:15:32 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-12-21 23:15:32 +0100 |
| commit | 0a3e9a9ac3a90da831b497e0613dfb66bc14f3d2 (patch) | |
| tree | b70f214f8c3fc802d6d6edbf8395273c854ac0fd /demux/ebml.h | |
| parent | a4fe95b0d8d339ba5afbdb5346ad8fd367a4a1c1 (diff) | |
| parent | 245e5b844177e9ad9a9c07eff5efab7c3fccdebc (diff) | |
| download | mpv-0a3e9a9ac3a90da831b497e0613dfb66bc14f3d2.tar.bz2 mpv-0a3e9a9ac3a90da831b497e0613dfb66bc14f3d2.tar.xz | |
Merge branch 'msg_refactor'
This branch changes mp_msg() so that it doesn't require global context.
The changes are pretty violent.
Diffstat (limited to 'demux/ebml.h')
| -rw-r--r-- | demux/ebml.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/demux/ebml.h b/demux/ebml.h index 8652746e48..9bfea7a8a6 100644 --- a/demux/ebml.h +++ b/demux/ebml.h @@ -26,6 +26,8 @@ #include "stream/stream.h" #include "bstr/bstr.h" +struct mp_log; + /* EBML version supported */ #define EBML_VERSION 1 @@ -57,6 +59,7 @@ struct ebml_elem_desc { }; struct ebml_parse_ctx { + struct mp_log *log; void *talloc_ctx; int bytes_read; bool has_errors; @@ -99,8 +102,9 @@ double ebml_read_float (stream_t *s, uint64_t *length); char *ebml_read_ascii (stream_t *s, uint64_t *length); char *ebml_read_utf8 (stream_t *s, uint64_t *length); int ebml_read_skip (stream_t *s, uint64_t *length); -int ebml_read_skip_or_resync_cluster(stream_t *s, uint64_t *length); -int ebml_resync_cluster(stream_t *s); +int ebml_read_skip_or_resync_cluster(struct mp_log *log, stream_t *s, + uint64_t *length); +int ebml_resync_cluster(struct mp_log *log, stream_t *s); uint32_t ebml_read_master (stream_t *s, uint64_t *length); int ebml_read_element(struct stream *s, struct ebml_parse_ctx *ctx, |