summaryrefslogtreecommitdiffstats
path: root/libmpdemux/ebml.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-10 01:46:46 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-10 01:50:55 +0200
commite74708f6194ef0af2bdf37e857ed232027fa46ba (patch)
treef7b53476abeb1cc8ccbe1c49113e9722c51b7800 /libmpdemux/ebml.c
parent2ad00b5319603b22f9b0858bb14d016f673157cb (diff)
parentcb8796857c8bd851e3b97d729af149e3f003b851 (diff)
downloadmpv-e74708f6194ef0af2bdf37e857ed232027fa46ba.tar.bz2
mpv-e74708f6194ef0af2bdf37e857ed232027fa46ba.tar.xz
Merge svn changes up to r30748
Diffstat (limited to 'libmpdemux/ebml.c')
-rw-r--r--libmpdemux/ebml.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpdemux/ebml.c b/libmpdemux/ebml.c
index ab35237a44..166c5df5cd 100644
--- a/libmpdemux/ebml.c
+++ b/libmpdemux/ebml.c
@@ -225,7 +225,7 @@ char *ebml_read_ascii(stream_t *s, uint64_t *length)
if (length)
*length = len + l;
- str = (char *) malloc(len + 1);
+ str = malloc(len + 1);
if (stream_read(s, str, len) != (int) len) {
free(str);
return NULL;