summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2008-04-05 00:53:25 +0100
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2008-04-05 00:53:25 +0100
commit1263a3ae411fe768568092ed755d08794d8f6b93 (patch)
tree3b0d765e5c3750b1277b9ca3f799488cbfea5e67
parentba4642f6a994fa157d958562183d40c0ed4e6937 (diff)
downloadxine-lib-1263a3ae411fe768568092ed755d08794d8f6b93.tar.gz
xine-lib-1263a3ae411fe768568092ed755d08794d8f6b93.tar.bz2
Fix a regression in the Matroska demuxer.
One '&'...
-rw-r--r--ChangeLog1
-rw-r--r--src/demuxers/ebml.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d08f74627..75c0b254e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
xine-lib (1.1.12) 2008-??-??
* Fixed and improved the PulseAudio driver.
* Fixed a regression in 1.1.11.1 which broke Quicktime container handling.
+ * And another, this time in the Matroska demuxer.
xine-lib (1.1.11.1) 2008-03-30
* Security fixes:
diff --git a/src/demuxers/ebml.c b/src/demuxers/ebml.c
index 0c633643f..4ce8a549d 100644
--- a/src/demuxers/ebml.c
+++ b/src/demuxers/ebml.c
@@ -327,7 +327,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);
}