Mercurial > mplayer.hg
changeset 28440:2218218264cb
Convert CONFIG_ZLIB into a 0/1 option.
| author | diego |
|---|---|
| date | Sat, 07 Feb 2009 15:23:55 +0000 |
| parents | c0451a1878fd |
| children | 669df097f203 |
| files | configure libmpdemux/demux_mkv.c libmpdemux/demux_mov.c |
| diffstat | 3 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Sat Feb 07 15:19:43 2009 +0000 +++ b/configure Sat Feb 07 15:23:55 2009 +0000 @@ -5979,7 +5979,7 @@ _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
--- a/libmpdemux/demux_mkv.c Sat Feb 07 15:19:43 2009 +0000 +++ b/libmpdemux/demux_mkv.c Sat Feb 07 15:23:55 2009 +0000 @@ -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 @@ 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 @@ 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,
--- a/libmpdemux/demux_mov.c Sat Feb 07 15:19:43 2009 +0000 +++ b/libmpdemux/demux_mov.c Sat Feb 07 15:23:55 2009 +0000 @@ -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 @@ 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 @@ 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;