mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 20:03:10 +02:00
Code

Convert CONFIG_ZLIB into a 0/1 option.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28475 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2009-02-07 15:23:55 +00:00
parent 66ae932317
commit 2817da6233
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -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

6
libmpdemux/demux_mkv.c
View File

@ -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,

6
libmpdemux/demux_mov.c
View File

@ -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;