diff options
| author | wm4 <wm4@nowhere> | 2013-12-21 20:24:20 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-12-21 21:43:16 +0100 |
| commit | 3dbc9007b080028f0aebbbf8b9ab1233cd70c45b (patch) | |
| tree | e6e46e5dd238338c44d421ef4f9101c9898c3cbf /demux/ebml.h | |
| parent | 9149e2af568d4cb251f8b105f360c3e6b9fd9d86 (diff) | |
| download | mpv-3dbc9007b080028f0aebbbf8b9ab1233cd70c45b.tar.bz2 mpv-3dbc9007b080028f0aebbbf8b9ab1233cd70c45b.tar.xz | |
demux: mp_msg conversions
The TV code pretends to be part of stream/, but it's actually demuxer
code too. The audio_in code is shared between the TV code and
stream_radio.c, so stream_radio.c needs a small hack until stream.c is
converted.
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, |