generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change semantic of CONFIG_*, HAVE_* and ARCH_*.

Browse Source 
They are now always defined to either 0 or 1.

Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs
2009-01-13 23:44:16 +00:00
parent 959da985b0
commit b250f9c66d
154 changed files with 757 additions and 749 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/tiffenc.c
View File

@@ -25,7 +25,7 @@
* @author Bartlomiej Wolowiec
*/
#include "avcodec.h"
#ifdef CONFIG_ZLIB
#if CONFIG_ZLIB
#include <zlib.h>
#endif
#include "bytestream.h"
@@ -151,7 +151,7 @@ static int encode_strip(TiffEncoderContext * s, const int8_t * src,
{
switch (compr) {
#ifdef CONFIG_ZLIB
#if CONFIG_ZLIB
case TIFF_DEFLATE:
case TIFF_ADOBE_DEFLATE:
{
@@ -229,7 +229,7 @@ static int encode_frame(AVCodecContext * avctx, unsigned char *buf,
s->compr = TIFF_RAW;
} else if(avctx->compression_level == 2) {
s->compr = TIFF_LZW;
#ifdef CONFIG_ZLIB
#if CONFIG_ZLIB
} else if ((avctx->compression_level >= 3)) {
s->compr = TIFF_DEFLATE;
#endif
@@ -315,7 +315,7 @@ static int encode_frame(AVCodecContext * avctx, unsigned char *buf,
}
}
#ifdef CONFIG_ZLIB
#if CONFIG_ZLIB
if (s->compr == TIFF_DEFLATE || s->compr == TIFF_ADOBE_DEFLATE) {
uint8_t *zbuf;
int zlen, zn;