diff options
author | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2013-07-16 13:28:28 +0200 |
---|---|---|
committer | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2013-11-03 21:59:54 +0100 |
commit | 37388ebb0ef9085c841d7f94e665a5a77cfe0e92 (patch) | |
tree | b47d18bee4e7f661d9e6d794dac0ec1cebcd3a37 /demux/demux_mkv.c | |
parent | 891a2a1f474add323145e6b2cd2d29181830e4a4 (diff) | |
download | mpv-37388ebb0ef9085c841d7f94e665a5a77cfe0e92.tar.bz2 mpv-37388ebb0ef9085c841d7f94e665a5a77cfe0e92.tar.xz |
configure: uniform the defines to #define HAVE_xxx (0|1)
The configure followed 5 different convetions of defines because the next guy
always wanted to introduce a new better way to uniform it[1]. For an
hypothetic feature 'hurr' you could have had:
* #define HAVE_HURR 1 / #undef HAVE_DURR
* #define HAVE_HURR / #undef HAVE_DURR
* #define CONFIG_HURR 1 / #undef CONFIG_DURR
* #define HAVE_HURR 1 / #define HAVE_DURR 0
* #define CONFIG_HURR 1 / #define CONFIG_DURR 0
All is now uniform and uses:
* #define HAVE_HURR 1
* #define HAVE_DURR 0
We like definining to 0 as opposed to `undef` bcause it can help spot typos
and is very helpful when doing big reorganizations in the code.
[1]: http://xkcd.com/927/ related
Diffstat (limited to 'demux/demux_mkv.c')
-rw-r--r-- | demux/demux_mkv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c index b26cba5a29..eb352e0f64 100644 --- a/demux/demux_mkv.c +++ b/demux/demux_mkv.c @@ -37,7 +37,7 @@ #include "config.h" -#if CONFIG_ZLIB +#if HAVE_ZLIB #include <zlib.h> #endif @@ -267,7 +267,7 @@ static bstr demux_mkv_decode(mkv_track_t *track, bstr data, uint32_t type) src = dest; // output from last iteration is new source if (enc->comp_algo == 0) { -#if CONFIG_ZLIB +#if HAVE_ZLIB /* zlib encoded track */ if (size == 0) @@ -457,7 +457,7 @@ static void parse_trackencodings(struct demuxer *demuxer, "[mkv] algorithm (%" PRIu64 "). Skipping track.\n", track->tnum, e.comp_algo); } -#if !CONFIG_ZLIB +#if !HAVE_ZLIB else if (e.comp_algo == 0) { mp_tmsg(MSGT_DEMUX, MSGL_WARN, "[mkv] Track %u was compressed with zlib " |