[SCM] libav/experimental: remove useless #ifdef CONFIG_ZLIB
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:55:17 UTC 2013
The following commit has been merged in the experimental branch:
commit e3d2a690e80481753c558c0f817c1942ff61defd
Author: Måns Rullgård <mans at mansr.com>
Date: Sun Jan 21 21:55:10 2007 +0000
remove useless #ifdef CONFIG_ZLIB
Originally committed as revision 7623 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/png.c b/libavcodec/png.c
index a257492..c7a2bd6 100644
--- a/libavcodec/png.c
+++ b/libavcodec/png.c
@@ -25,7 +25,6 @@
* - use filters when generating a png (better compression)
*/
-#ifdef CONFIG_ZLIB
#include <zlib.h>
//#define DEBUG
@@ -965,4 +964,3 @@ AVCodec png_encoder = {
.pix_fmts= (enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGBA32, PIX_FMT_PAL8, PIX_FMT_GRAY8, PIX_FMT_MONOBLACK, -1},
};
#endif // CONFIG_PNG_ENCODER
-#endif
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list