diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2009-01-13 23:44:16 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2009-01-13 23:44:16 +0000 |
| commit | b250f9c66d3ddd84652d158fb979a5f21e3f2c71 (patch) | |
| tree | ef84366029d6f8af6ed82e90c5f188bb7dfc844d /libavcodec/tiff.c | |
| parent | 959da985b03570cfe7d239c0ba6d550ecb04c460 (diff) | |
| download | ffmpeg-b250f9c66d3ddd84652d158fb979a5f21e3f2c71.tar.gz | |
Change semantic of CONFIG_*, HAVE_* and ARCH_*.
They are now always defined to either 0 or 1.
Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/tiff.c')
| -rw-r--r-- | libavcodec/tiff.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index 582076bede..9880391bc8 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -25,7 +25,7 @@ * @author Konstantin Shishkov */ #include "avcodec.h" -#ifdef CONFIG_ZLIB +#if CONFIG_ZLIB #include <zlib.h> #endif #include "lzw.h" @@ -78,7 +78,7 @@ static int tiff_unpack_strip(TiffContext *s, uint8_t* dst, int stride, const uin int c, line, pixels, code; const uint8_t *ssrc = src; int width = s->width * s->bpp >> 3; -#ifdef CONFIG_ZLIB +#if CONFIG_ZLIB uint8_t *zbuf; unsigned long outlen; if(s->compr == TIFF_DEFLATE || s->compr == TIFF_ADOBE_DEFLATE){ @@ -298,7 +298,7 @@ static int tiff_decode_tag(TiffContext *s, const uint8_t *start, const uint8_t * break; case TIFF_DEFLATE: case TIFF_ADOBE_DEFLATE: -#ifdef CONFIG_ZLIB +#if CONFIG_ZLIB break; #else av_log(s->avctx, AV_LOG_ERROR, "Deflate: ZLib not compiled in\n"); |