diff options
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | libmpdemux/demux_mkv.c | 6 | ||||
| -rw-r--r-- | libmpdemux/demux_mov.c | 6 |
3 files changed, 7 insertions, 7 deletions
@@ -5979,7 +5979,7 @@ if test "$_zlib" = yes ; then _def_zlib='#define CONFIG_ZLIB 1' _ld_extra="$_ld_extra -lz" else - _def_zlib='#undef CONFIG_ZLIB' + _def_zlib='#define CONFIG_ZLIB 0' _libavdecoders=`echo $_libavdecoders | sed -e s/FLASHSV_DECODER// -e s/PNG_DECODER// -e s/ZMBV_DECODER// -e s/DXA_DECODER// -e s/TSCC_DECODER// ` _libavencoders=`echo $_libavencoders | sed -e s/FLASHSV_ENCODER// -e s/PNG_ENCODER// -e s/ZMBV_ENCODER// ` fi diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c index 8c04a5132d..e74aaa2e85 100644 --- a/libmpdemux/demux_mkv.c +++ b/libmpdemux/demux_mkv.c @@ -35,7 +35,7 @@ #include "loader/qtx/qtxsdk/components.h" #endif -#ifdef CONFIG_ZLIB +#if CONFIG_ZLIB #include <zlib.h> #endif @@ -299,7 +299,7 @@ demux_mkv_decode (mkv_track_t *track, uint8_t *src, uint8_t **dest, if (!(track->encodings[i].scope & type)) continue; -#ifdef CONFIG_ZLIB +#if CONFIG_ZLIB if (track->encodings[i].comp_algo == 0) { /* zlib encoded track */ @@ -547,7 +547,7 @@ demux_mkv_read_trackencodings (demuxer_t *demuxer, mkv_track_t *track) MSGTR_MPDEMUX_MKV_UnknownCompression, track->tnum, e.comp_algo); } -#ifndef CONFIG_ZLIB +#if !CONFIG_ZLIB else if (e.comp_algo == 0) { mp_msg (MSGT_DEMUX, MSGL_WARN, diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c index 1164167140..75bba25b2c 100644 --- a/libmpdemux/demux_mov.c +++ b/libmpdemux/demux_mov.c @@ -48,7 +48,7 @@ #include "qtpalette.h" #include "parse_mp4.h" // .MP4 specific stuff -#ifdef CONFIG_ZLIB +#if CONFIG_ZLIB #include <zlib.h> #endif @@ -1395,7 +1395,7 @@ static void lschunks(demuxer_t* demuxer,int level,off_t endpos,mov_track_t* trak trak=NULL; break; } -#ifndef CONFIG_ZLIB +#if !CONFIG_ZLIB case MOV_FOURCC('c','m','o','v'): { mp_msg(MSGT_DEMUX,MSGL_ERR,MSGTR_MOVcomprhdr); return; @@ -2026,7 +2026,7 @@ static demuxer_t* mov_read_header(demuxer_t* demuxer){ char2int(trak->stdata,12)==MOV_FOURCC('z','l','i','b') ){ int newlen=stream_read_dword(demuxer->stream); -#ifdef CONFIG_ZLIB +#if CONFIG_ZLIB // unzip: z_stream zstrm; int zret; |