summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_mkv.c
diff options
context:
space:
mode:
Diffstat (limited to 'libmpdemux/demux_mkv.c')
-rw-r--r--libmpdemux/demux_mkv.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c
index 3bd7b64057..7352b02bff 100644
--- a/libmpdemux/demux_mkv.c
+++ b/libmpdemux/demux_mkv.c
@@ -32,11 +32,11 @@
#include "libavutil/common.h"
-#ifdef USE_QTX_CODECS
+#ifdef CONFIG_QTX_CODECS
#include "loader/qtx/qtxsdk/components.h"
#endif
-#ifdef HAVE_ZLIB
+#ifdef CONFIG_ZLIB
#include <zlib.h>
#endif
@@ -470,7 +470,7 @@ demux_mkv_decode (mkv_track_t *track, uint8_t *src, uint8_t **dest,
if (!(track->encodings[i].scope & type))
continue;
-#ifdef HAVE_ZLIB
+#ifdef CONFIG_ZLIB
if (track->encodings[i].comp_algo == 0)
{
/* zlib encoded track */
@@ -718,7 +718,7 @@ demux_mkv_read_trackencodings (demuxer_t *demuxer, mkv_track_t *track)
MSGTR_MPDEMUX_MKV_UnknownCompression,
track->tnum, e.comp_algo);
}
-#ifndef HAVE_ZLIB
+#ifndef CONFIG_ZLIB
else if (e.comp_algo == 0)
{
mp_msg (MSGT_DEMUX, MSGL_WARN,
@@ -1756,7 +1756,7 @@ demux_mkv_open_video (demuxer_t *demuxer, mkv_track_t *track, int vid)
stream_read(demuxer->stream, dst+8, cnt);
track->realmedia = 1;
-#ifdef USE_QTX_CODECS
+#ifdef CONFIG_QTX_CODECS
}
else if (track->private_size >= sizeof (ImageDescription)
&& !strcmp(track->codec_id, MKV_V_QUICKTIME))
@@ -1782,7 +1782,7 @@ demux_mkv_open_video (demuxer_t *demuxer, mkv_track_t *track, int vid)
bih->biPlanes = 1;
bih->biCompression = idesc->cType;
ImageDesc = idesc;
-#endif /* USE_QTX_CODECS */
+#endif /* CONFIG_QTX_CODECS */
}
else