diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-04-06 19:41:43 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-04-06 19:41:43 +0100 |
| commit | 40a1c7da2f5cfb6ed7210cbea192acd1b0231c41 (patch) | |
| tree | 7ee720d1b7e6692ad26e277e5fa08f928642a533 /src/demuxers/ebml.c | |
| parent | 039b044abf0830eebf90e54d575a179a4ac0f0e1 (diff) | |
| parent | b1c711f131520ce268b6403bb7e61595300c5b81 (diff) | |
| download | xine-lib-40a1c7da2f5cfb6ed7210cbea192acd1b0231c41.tar.gz xine-lib-40a1c7da2f5cfb6ed7210cbea192acd1b0231c41.tar.bz2 | |
Merge from 1.1; adapt xine-list for 1.2.
--HG--
rename : debian/libxine1.install => debian/libxine2.install
rename : src/demuxers/demux_ogg.c => src/combined/xine_ogg_demuxer.c
Diffstat (limited to 'src/demuxers/ebml.c')
| -rw-r--r-- | src/demuxers/ebml.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/demuxers/ebml.c b/src/demuxers/ebml.c index 97bf0a615..1e9a456d2 100644 --- a/src/demuxers/ebml.c +++ b/src/demuxers/ebml.c @@ -321,7 +321,7 @@ char *ebml_alloc_read_ascii (ebml_parser_t *ebml, ebml_elem_t *elem) if (text) { text[elem->len] = '\0'; - if (ebml_read_ascii (ebml, &elem, text)) + if (ebml_read_ascii (ebml, elem, text)) return text; free (text); } |