diff options
| author | Zdenek Kabelac <kabi@informatics.muni.cz> | 2003-02-27 17:32:56 +0000 |
|---|---|---|
| committer | Zdenek Kabelac <kabi@informatics.muni.cz> | 2003-02-27 17:32:56 +0000 |
| commit | 3a13f6bd48be7774d16e6b82df7e96aaaf1d71f5 (patch) | |
| tree | dd1a2d7a4aa74d4221859b2a50f2dbe6f6e386dc | |
| parent | 2ec23b6d44313a2f8a69120e46369b801a5cce38 (diff) | |
* compile PNG only when ZLIB is available
Originally committed as revision 1609 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/allformats.c | 2 | ||||
| -rw-r--r-- | libavformat/avformat.h | 2 | ||||
| -rw-r--r-- | libavformat/png.c | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 6303dc2b18..cd80136c64 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -75,7 +75,9 @@ void av_register_all(void) av_register_image_format(&ppm_image_format); av_register_image_format(&pgmyuv_image_format); av_register_image_format(&yuv_image_format); +#ifdef CONFIG_ZLIB av_register_image_format(&png_image_format); +#endif av_register_image_format(&jpeg_image_format); av_register_image_format(&gif_image_format); diff --git a/libavformat/avformat.h b/libavformat/avformat.h index c78b98aa70..a58e73c4fa 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -253,7 +253,9 @@ extern AVImageFormat pgm_image_format; extern AVImageFormat ppm_image_format; extern AVImageFormat pgmyuv_image_format; extern AVImageFormat yuv_image_format; +#ifdef CONFIG_ZLIB extern AVImageFormat png_image_format; +#endif extern AVImageFormat jpeg_image_format; extern AVImageFormat gif_image_format; diff --git a/libavformat/png.c b/libavformat/png.c index e4facf80fa..75d07ddcee 100644 --- a/libavformat/png.c +++ b/libavformat/png.c @@ -18,6 +18,7 @@ */ #include "avformat.h" +#ifdef CONFIG_ZLIB #include <zlib.h> //#define DEBUG @@ -563,3 +564,4 @@ AVImageFormat png_image_format = { (1 << PIX_FMT_RGB24) | (1 << PIX_FMT_GRAY8) | (1 << PIX_FMT_MONOBLACK) | (1 << PIX_FMT_PAL8), png_write, }; +#endif |