# HG changeset patch # User reimar # Date 1216230514 0 # Node ID 6d5c1d9bf273250dbf950c6f42843883bd1c69af # Parent e96d8e20bf69c677f319845a8085eca23389e1dd And a 1000l for r27263, swapped a condition, thus setting size to 0 when malloc succeeded instead of when it failed. diff -r e96d8e20bf69 -r 6d5c1d9bf273 libmpdemux/demux_mov.c --- a/libmpdemux/demux_mov.c Wed Jul 16 17:28:19 2008 +0000 +++ b/libmpdemux/demux_mov.c Wed Jul 16 17:48:34 2008 +0000 @@ -1751,7 +1751,7 @@ "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);