diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 01:46:46 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 01:50:55 +0200 |
| commit | e74708f6194ef0af2bdf37e857ed232027fa46ba (patch) | |
| tree | f7b53476abeb1cc8ccbe1c49113e9722c51b7800 /libmpdemux/demuxer.c | |
| parent | 2ad00b5319603b22f9b0858bb14d016f673157cb (diff) | |
| parent | cb8796857c8bd851e3b97d729af149e3f003b851 (diff) | |
| download | mpv-e74708f6194ef0af2bdf37e857ed232027fa46ba.tar.bz2 mpv-e74708f6194ef0af2bdf37e857ed232027fa46ba.tar.xz | |
Merge svn changes up to r30748
Diffstat (limited to 'libmpdemux/demuxer.c')
| -rw-r--r-- | libmpdemux/demuxer.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 589cdeeb37..e00a9cfb68 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -1301,8 +1301,7 @@ int demux_info_add(demuxer_t *demuxer, const char *opt, const char *param) } } - info = demuxer->info = - (char **) realloc(info, (2 * (n + 2)) * sizeof(char *)); + info = demuxer->info = realloc(info, (2 * (n + 2)) * sizeof(char *)); info[2 * n] = strdup(opt); info[2 * n + 1] = strdup(param); memset(&info[2 * (n + 1)], 0, 2 * sizeof(char *)); |