diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-04-08 02:43:44 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-04-08 02:43:44 +0300 |
commit | 53eeb0e41238699fb11701c357941f904338bb25 (patch) | |
tree | 965f3585bc690f9b5f654f1022a4c02709911706 /libmpdemux/demux_demuxers.c | |
parent | b309b60a0c7230fae29475e8924ff51f107c2563 (diff) | |
parent | 96daf7ed5ef96b86f2539164c27155bc830aa2a6 (diff) | |
download | mpv-53eeb0e41238699fb11701c357941f904338bb25.tar.bz2 mpv-53eeb0e41238699fb11701c357941f904338bb25.tar.xz |
Merge branch 'ordered_chapters'
Diffstat (limited to 'libmpdemux/demux_demuxers.c')
-rw-r--r-- | libmpdemux/demux_demuxers.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libmpdemux/demux_demuxers.c b/libmpdemux/demux_demuxers.c index a5f87e601b..dc04ecffd0 100644 --- a/libmpdemux/demux_demuxers.c +++ b/libmpdemux/demux_demuxers.c @@ -8,6 +8,7 @@ #include "stream/stream.h" #include "demuxer.h" #include "stheader.h" +#include "talloc.h" typedef struct dd_priv { demuxer_t* vd; @@ -21,7 +22,7 @@ demuxer_t* new_demuxers_demuxer(demuxer_t* vd, demuxer_t* ad, demuxer_t* sd) { demuxer_t* ret; dd_priv_t* priv; - ret = calloc(1,sizeof(demuxer_t)); + ret = talloc_zero(NULL, struct demuxer); priv = malloc(sizeof(dd_priv_t)); priv->vd = vd; |