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/muxer_lavf.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/muxer_lavf.c')
| -rw-r--r-- | libmpdemux/muxer_lavf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpdemux/muxer_lavf.c b/libmpdemux/muxer_lavf.c index ed6025317d..300381a239 100644 --- a/libmpdemux/muxer_lavf.c +++ b/libmpdemux/muxer_lavf.c @@ -340,7 +340,7 @@ int muxer_init_muxer_lavf(muxer_t *muxer) "will play these INCORRECT files as if nothing were wrong!\n" "*******************************************************************************\n"); - priv = (muxer_priv_t *) calloc(1, sizeof(muxer_priv_t)); + priv = calloc(1, sizeof(muxer_priv_t)); if(priv == NULL) return 0; |