Mercurial > mplayer.hg

diff libmpdemux/demux_mov.c @ 27341:e7c989f7a7c9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Start unifying names of internal preprocessor directives. Replace all USE_ prefixes by CONFIG_ prefixes to indicate options which are configurable.
author diego
date Wed, 30 Jul 2008 12:01:30 +0000
parents 6d5c1d9bf273
children ac03760f7fcc
line wrap: on
line diff
--- a/libmpdemux/demux_mov.c	Wed Jul 30 11:48:01 2008 +0000
+++ b/libmpdemux/demux_mov.c	Wed Jul 30 12:01:30 2008 +0000
@@ -48,7 +48,7 @@
 #include "qtpalette.h"
 #include "parse_mp4.h" // .MP4 specific stuff
 
-#ifdef HAVE_ZLIB
+#ifdef CONFIG_ZLIB
 #include <zlib.h>
 #endif
 
@@ -1395,7 +1395,7 @@
 	    trak=NULL;
 	    break;
 	}
-#ifndef HAVE_ZLIB
+#ifndef 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 HAVE_ZLIB
+#ifdef CONFIG_ZLIB
 			// unzip:
 			z_stream zstrm;
 			int zret;