[SCM] libav/experimental: Don't break compilation on systems without zlib.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:55:14 UTC 2013
The following commit has been merged in the experimental branch:
commit 97ec93e1767d379d835447f8069cc401de1664ce
Author: Benjamin Larsson <banan at ludd.ltu.se>
Date: Sun Jan 21 17:48:03 2007 +0000
Don't break compilation on systems without zlib.
Originally committed as revision 7608 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/flashsv.c b/libavcodec/flashsv.c
index b5905e1..3684773 100644
--- a/libavcodec/flashsv.c
+++ b/libavcodec/flashsv.c
@@ -49,6 +49,7 @@
#include <stdio.h>
#include <stdlib.h>
+#ifdef CONFIG_ZLIB
#include <zlib.h>
#include "common.h"
@@ -257,3 +258,4 @@ AVCodec flashsv_decoder = {
CODEC_CAP_DR1,
.pix_fmts = (enum PixelFormat[]){PIX_FMT_BGR24, -1},
};
+#endif //CONFIG_ZLIB
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list