diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-02-07 15:23:55 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-02-07 15:23:55 +0000 |
commit | 2817da6233486d30f15b12cac1423c01ee1b82d4 (patch) | |
tree | 42455dce2c2fc264d8633ee03175e1b944d6592b /libmpdemux/demux_mov.c | |
parent | 66ae932317b36d720316a2b5d2c1f250cfcdfc79 (diff) | |
download | mpv-2817da6233486d30f15b12cac1423c01ee1b82d4.tar.bz2 mpv-2817da6233486d30f15b12cac1423c01ee1b82d4.tar.xz |
Convert CONFIG_ZLIB into a 0/1 option.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28475 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_mov.c')
-rw-r--r-- | libmpdemux/demux_mov.c | 6 |
1 files changed, 3 insertions, 3 deletions
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; |