diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-12-13 22:20:44 +0100 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-12-13 22:20:44 +0100 |
| commit | 42d23a86ff422f650b16ec786f5e96b126ec680a (patch) | |
| tree | 991158f109e0ac97adbe7510529e535fc06234f4 /src/demuxers/ebml.c | |
| parent | 44234828cf17a0a302975dc3f5f8b671f86a8ac2 (diff) | |
| parent | fc2fa145300536b0a19f878212912e9b2d5b57a1 (diff) | |
| download | xine-lib-42d23a86ff422f650b16ec786f5e96b126ec680a.tar.gz xine-lib-42d23a86ff422f650b16ec786f5e96b126ec680a.tar.bz2 | |
Merge changes from 1.2 main.last-internal-ffmpeg
Diffstat (limited to 'src/demuxers/ebml.c')
| -rw-r--r-- | src/demuxers/ebml.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/demuxers/ebml.c b/src/demuxers/ebml.c index ac44aecd7..218046cf5 100644 --- a/src/demuxers/ebml.c +++ b/src/demuxers/ebml.c @@ -185,7 +185,7 @@ static int ebml_read_elem_len(ebml_parser_t *ebml, uint64_t *len) { } -static int ebml_read_elem_data(ebml_parser_t *ebml, int8_t *buf, int64_t len) { +static int ebml_read_elem_data(ebml_parser_t *ebml, void *buf, int64_t len) { if (ebml->input->read(ebml->input, buf, len) != len) { off_t pos = ebml->input->get_current_pos(ebml->input); @@ -346,7 +346,7 @@ int ebml_read_master (ebml_parser_t *ebml, ebml_elem_t *elem) { } } -int ebml_read_binary(ebml_parser_t *ebml, ebml_elem_t *elem, uint8_t *binary) { +int ebml_read_binary(ebml_parser_t *ebml, ebml_elem_t *elem, void *binary) { if (!ebml_read_elem_data(ebml, binary, elem->len)) return 0; |