diff options
Diffstat (limited to 'demux')
| -rw-r--r-- | demux/demux.c | 6 | ||||
| -rw-r--r-- | demux/demux_mkv.c | 6 | ||||
| -rw-r--r-- | demux/mf.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/demux/demux.c b/demux/demux.c index ba632218ec..eeb979be9d 100644 --- a/demux/demux.c +++ b/demux/demux.c @@ -70,16 +70,16 @@ const demuxer_desc_t *const demuxer_list[] = { &demuxer_desc_cue, &demuxer_desc_rawaudio, &demuxer_desc_rawvideo, -#ifdef CONFIG_TV +#if HAVE_TV &demuxer_desc_tv, #endif -#ifdef CONFIG_ASS +#if HAVE_LIBASS &demuxer_desc_libass, #endif &demuxer_desc_matroska, &demuxer_desc_lavf, &demuxer_desc_mf, -#ifdef CONFIG_MNG +#if HAVE_MNG &demuxer_desc_mng, #endif &demuxer_desc_playlist, 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 " diff --git a/demux/mf.c b/demux/mf.c index 8682e846bf..d1060efc3c 100644 --- a/demux/mf.c +++ b/demux/mf.c @@ -30,7 +30,7 @@ #include "config.h" -#ifdef HAVE_GLOB +#if HAVE_GLOB #include <glob.h> #else #include "osdep/glob.h" |