diff options
| author | wm4 <wm4@nowhere> | 2013-04-30 00:52:32 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-04-30 00:52:32 +0200 |
| commit | ea7b920184a865a3343001318fc4a32dcfc7b4f5 (patch) | |
| tree | fbefd8539b77ee7473ad73740cc8ffa97bc4ffbe /demux/ebml.h | |
| parent | 3dcc83a70609d392c8ecd917dd5c16995424e9c4 (diff) | |
| parent | d98e61ea438db66323734ad1b6bea66411a3c97b (diff) | |
| download | mpv-ea7b920184a865a3343001318fc4a32dcfc7b4f5.tar.bz2 mpv-ea7b920184a865a3343001318fc4a32dcfc7b4f5.tar.xz | |
Merge branch 'master' into low_quality_intel_crap
Conflicts:
video/out/gl_video_shaders.glsl
video/out/vo_opengl.c
Diffstat (limited to 'demux/ebml.h')
| -rw-r--r-- | demux/ebml.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/demux/ebml.h b/demux/ebml.h index 492144e5b7..3f8bad0f92 100644 --- a/demux/ebml.h +++ b/demux/ebml.h @@ -90,8 +90,8 @@ struct ebml_parse_ctx { uint32_t ebml_read_id (stream_t *s, int *length); -uint64_t ebml_read_vlen_uint (uint8_t *buffer, int *length); -int64_t ebml_read_vlen_int (uint8_t *buffer, int *length); +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); @@ -99,6 +99,8 @@ 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); uint32_t ebml_read_master (stream_t *s, uint64_t *length); int ebml_read_element(struct stream *s, struct ebml_parse_ctx *ctx, |