Commit Graph

7 Commits

Author SHA1 Message Date
Moritz Bunkus
5d93db753e
nlohmann-json: bump bundled version to latest release, v3.6.1 2019-05-18 15:51:55 +02:00
Moritz Bunkus
f95b016e1f
nlohmann-json: update to v3.5.0 2019-01-03 19:03:52 +01:00
Moritz Bunkus
21d09d4bcd
nlohmann JSON: don't use std::snprintf
libintl.h defines a preprocessor define for `snprintf` with the
content of `libintl_snprintf` if the C library isn't GNU's
glibc. Therefore `std::snprintf` actually becomes
`std::libintl_snprintf` which doesn't exist. This affects e.g. mingw
and macOS.
2018-06-08 23:11:53 +02:00
Moritz Bunkus
471fc84ed2
nlohmann-json: update to v3.1.1 (git revision g183390c1) 2018-06-08 22:17:08 +02:00
Moritz Bunkus
42271f5c57 JSON: update nlohmann's JSON library
The old revision has a serious memory usage issue. For example, on
Windows a 650 KB JSON file results in memory usage of roughly 2 GB of
allocated RAM that won't be freed anymore.

The updated version doesn't have this problem anymore.

Fixes #1631.
2016-03-29 20:05:50 +02:00
Moritz Bunkus
6747ed3925 JSON: use uint64_t as storage type by default
Otherwise 64bit values > maximum int64_t are output as signed ones, and
mkvmerge doesn't need to output signed integer values at the moment.

I've also opened an issue for that:
https://github.com/nlohmann/json/issues/151
2015-11-22 17:23:26 +01:00
Moritz Bunkus
0994156ee1 mkvmerge: implement JSON identification output mode 2015-11-14 12:49:04 +01:00