Mercurial > libavcodec.hg

comparison cscd.c @ 8590:7a463923ecd1 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change semantic of CONFIG_*, HAVE_* and ARCH_*. They are now always defined to either 0 or 1.
author aurel
date Tue, 13 Jan 2009 23:44:16 +0000
parents 4525dcd81357
children 967c0a1a60a0
comparison
equal deleted inserted replaced
8589:a29b5b5c3c9d 8590:7a463923ecd1
21 #include <stdio.h> 21 #include <stdio.h>
22 #include <stdlib.h> 22 #include <stdlib.h>
23 23
24 #include "avcodec.h" 24 #include "avcodec.h"
25 25
26 #ifdef CONFIG_ZLIB 26 #if CONFIG_ZLIB
27 #include <zlib.h> 27 #include <zlib.h>
28 #endif 28 #endif
29 #include "libavutil/lzo.h" 29 #include "libavutil/lzo.h"
30 30
31 typedef struct { 31 typedef struct {
161 if (lzo1x_decode(c->decomp_buf, &outlen, &buf[2], &inlen)) 161 if (lzo1x_decode(c->decomp_buf, &outlen, &buf[2], &inlen))
162 av_log(avctx, AV_LOG_ERROR, "error during lzo decompression\n"); 162 av_log(avctx, AV_LOG_ERROR, "error during lzo decompression\n");
163 break; 163 break;
164 } 164 }
165 case 1: { // zlib compression 165 case 1: { // zlib compression
166 #ifdef CONFIG_ZLIB 166 #if CONFIG_ZLIB
167 unsigned long dlen = c->decomp_size; 167 unsigned long dlen = c->decomp_size;
168 if (uncompress(c->decomp_buf, &dlen, &buf[2], buf_size - 2) != Z_OK) 168 if (uncompress(c->decomp_buf, &dlen, &buf[2], buf_size - 2) != Z_OK)
169 av_log(avctx, AV_LOG_ERROR, "error during zlib decompression\n"); 169 av_log(avctx, AV_LOG_ERROR, "error during zlib decompression\n");
170 break; 170 break;
171 #else 171 #else