diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-07-16 17:48:34 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-07-16 17:48:34 +0000 |
| commit | b422b105d7767fbb40aad7b81b34aa033a168057 (patch) | |
| tree | a11365e0cbf193ad0e6d4d6c77231a9ecad7e368 /libmpdemux | |
| parent | 2f5b26277f88b747584c017e696bad1eda50ef77 (diff) | |
| download | mpv-b422b105d7767fbb40aad7b81b34aa033a168057.tar.bz2 mpv-b422b105d7767fbb40aad7b81b34aa033a168057.tar.xz | |
And a 1000l for r27263, swapped a condition, thus setting size to
0 when malloc succeeded instead of when it failed.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27304 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_mov.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c index 613b4548b2..37de352510 100644 --- a/libmpdemux/demux_mov.c +++ b/libmpdemux/demux_mov.c @@ -1751,7 +1751,7 @@ static int lschunks_intrak(demuxer_t* demuxer, int level, unsigned int id, "MOV: %*sSample duration table! (%d blocks)\n", level, "", len); trak->durmap = calloc(len, sizeof(mov_durmap_t)); - trak->durmap_size = trak->durmap ? 0 : len; + trak->durmap_size = trak->durmap ? len : 0; for (i = 0; i < trak->durmap_size; i++) { trak->durmap[i].num = stream_read_dword(demuxer->stream); trak->durmap[i].dur = stream_read_dword(demuxer->stream); |