From 4b141479da70665db8d5780c9ca9e430c9dd1f09 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 30 Jul 2008 12:01:30 +0000 Subject: Start unifying names of internal preprocessor directives. Replace all USE_ prefixes by CONFIG_ prefixes to indicate options which are configurable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27373 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demux_mkv.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libmpdemux/demux_mkv.c') diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c index b870dff0ac..3e667d2534 100644 --- a/libmpdemux/demux_mkv.c +++ b/libmpdemux/demux_mkv.c @@ -31,11 +31,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 #endif @@ -473,7 +473,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 */ @@ -721,7 +721,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, @@ -1757,7 +1757,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)) @@ -1783,7 +1783,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 -- cgit v1.2.3