diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-26 00:58:15 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-26 00:58:15 +0200 |
| commit | dd888b05ff3af1c6c35582e75bedae687d38fc66 (patch) | |
| tree | 7f6f162208cd2d32a6a7ac2cfa886e8befadf4f9 /playtree.c | |
| parent | 0406d951209df261970424256d76f293649ec140 (diff) | |
| parent | 85b28eb411cfa304f1714219ebd17b10a0977fa3 (diff) | |
| download | mpv-dd888b05ff3af1c6c35582e75bedae687d38fc66.tar.bz2 mpv-dd888b05ff3af1c6c35582e75bedae687d38fc66.tar.xz | |
Merge svn changes up to r28366
Contains more changes needed to sync build system with latest FFmpeg.
Conflicts:
Makefile
configure
mplayer.c
Diffstat (limited to 'playtree.c')
| -rw-r--r-- | playtree.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/playtree.c b/playtree.c index c499e8d1d7..1124d2f023 100644 --- a/playtree.c +++ b/playtree.c @@ -21,8 +21,10 @@ play_tree_is_valid(play_tree_t* pt); play_tree_t* play_tree_new(void) { play_tree_t* r = calloc(1,sizeof(play_tree_t)); - if(r == NULL) + if(r == NULL) { mp_msg(MSGT_PLAYTREE,MSGL_ERR,"Can't allocate %d bytes of memory\n",(int)sizeof(play_tree_t)); + return NULL; + } r->entry_type = PLAY_TREE_ENTRY_NODE; return r; } |