This activates the const-enabled zlib API and kills related warnings.
---
libavcodec/cscd.c | 11 +++++++----
libavcodec/dxa.c | 5 +++--
libavcodec/exr.c | 1 +
libavcodec/flashsv.c | 1 +
libavcodec/flashsvenc.c | 1 +
libavcodec/g2meet.c | 1 +
libavcodec/lcldec.c | 10 ++++++----
libavcodec/lclenc.c | 1 +
libavcodec/pngdec.c | 1 +
libavcodec/pngenc.c | 1 +
libavcodec/svq3.c | 11 ++++++-----
libavcodec/tiff.c | 1 +
libavcodec/tiffenc.c | 1 +
libavcodec/tscc.c | 4 ++--
libavcodec/zerocodec.c | 1 +
libavcodec/zmbv.c | 4 ++--
libavcodec/zmbvenc.c | 4 ++--
libavformat/http.c | 1 +
libavformat/matroskadec.c | 1 +
libavformat/mov.c | 11 ++++++-----
libavformat/rtmpproto.c | 11 +++++++----
tools/cws2fws.c | 1 +
22 files changed, 54 insertions(+), 30 deletions(-)
diff --git a/libavcodec/cscd.c b/libavcodec/cscd.c
index 9ae7e33..a860e0a 100644
--- a/libavcodec/cscd.c
+++ b/libavcodec/cscd.c
@@ -18,16 +18,19 @@
* License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+#include "config.h"
+
+#if CONFIG_ZLIB
+#define ZLIB_CONST
+#include <zlib.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
#include "avcodec.h"
#include "internal.h"
#include "libavutil/common.h"
-
-#if CONFIG_ZLIB
-#include <zlib.h>
-#endif
#include "libavutil/lzo.h"
typedef struct {
diff --git a/libavcodec/dxa.c b/libavcodec/dxa.c
index fa0677d..11c72cd 100644
--- a/libavcodec/dxa.c
+++ b/libavcodec/dxa.c
@@ -24,6 +24,9 @@
* DXA Video decoder
*/
+#define ZLIB_CONST
+#include <zlib.h>
+
#include <stdio.h>
#include <stdlib.h>
@@ -32,8 +35,6 @@
#include "avcodec.h"
#include "internal.h"
-#include <zlib.h>
-
/*
* Decoder context
*/
diff --git a/libavcodec/exr.c b/libavcodec/exr.c
index 37a31ce..16aca7f 100644
--- a/libavcodec/exr.c
+++ b/libavcodec/exr.c
@@ -30,6 +30,7 @@
* exr_flt2uint() and exr_halflt2uint() is credited to Reimar Döffinger
*/
+#define ZLIB_CONST
#include <zlib.h>
#include "libavutil/imgutils.h"
diff --git a/libavcodec/flashsv.c b/libavcodec/flashsv.c
index de7979c..9d07c66 100644
--- a/libavcodec/flashsv.c
+++ b/libavcodec/flashsv.c
@@ -35,6 +35,7 @@
#include <stdio.h>
#include <stdlib.h>
+#define ZLIB_CONST
#include <zlib.h>
#include "libavutil/intreadwrite.h"
diff --git a/libavcodec/flashsvenc.c b/libavcodec/flashsvenc.c
index 71c81bd..883a5d3 100644
--- a/libavcodec/flashsvenc.c
+++ b/libavcodec/flashsvenc.c
@@ -46,6 +46,7 @@
#include <stdio.h>
#include <stdlib.h>
+#define ZLIB_CONST
#include <zlib.h>
#include "avcodec.h"
diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c
index c405f38..7482b2f 100644
--- a/libavcodec/g2meet.c
+++ b/libavcodec/g2meet.c
@@ -25,6 +25,7 @@
*/
#include <inttypes.h>
+#define ZLIB_CONST
#include <zlib.h>
#include "libavutil/intreadwrite.h"
diff --git a/libavcodec/lcldec.c b/libavcodec/lcldec.c
index 4d97948..5c35c4c 100644
--- a/libavcodec/lcldec.c
+++ b/libavcodec/lcldec.c
@@ -38,6 +38,12 @@
*
*/
+#include "config.h"
+
+#if CONFIG_ZLIB_DECODER
+#define ZLIB_CONST
+#include <zlib.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
@@ -47,10 +53,6 @@
#include "internal.h"
#include "lcl.h"
-#if CONFIG_ZLIB_DECODER
-#include <zlib.h>
-#endif
-
/*
* Decoder context
*/
diff --git a/libavcodec/lclenc.c b/libavcodec/lclenc.c
index 878d1e1..35e5ad7 100644
--- a/libavcodec/lclenc.c
+++ b/libavcodec/lclenc.c
@@ -46,6 +46,7 @@
#include "libavutil/internal.h"
#include "libavutil/mem.h"
+#define ZLIB_CONST
#include <zlib.h>
/*
diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c
index fe5590d..09a69d0 100644
--- a/libavcodec/pngdec.c
+++ b/libavcodec/pngdec.c
@@ -29,6 +29,7 @@
* - add 2, 4 and 16 bit depth support
*/
+#define ZLIB_CONST
#include <zlib.h>
typedef struct PNGDecContext {
diff --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c
index 3d11f37..f9d5c93 100644
--- a/libavcodec/pngenc.c
+++ b/libavcodec/pngenc.c
@@ -28,6 +28,7 @@
* - add 2, 4 and 16 bit depth support
*/
+#define ZLIB_CONST
#include <zlib.h>
#define IOBUF_SIZE 4096
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c
index fc2120b..e43551b 100644
--- a/libavcodec/svq3.c
+++ b/libavcodec/svq3.c
@@ -40,6 +40,12 @@
* http://samples.libav.org/V-codecs/SVQ3/Vertical400kbit.sorenson3.mov
*/
+#include "config.h"
+
+#if CONFIG_ZLIB
+#define ZLIB_CONST
+#include <zlib.h>
+#endif
#include <inttypes.h>
#include "libavutil/attributes.h"
@@ -55,11 +61,6 @@
#include "hpeldsp.h"
#include "rectangle.h"
#include "tpeldsp.h"
-
-#if CONFIG_ZLIB
-#include <zlib.h>
-#endif
-
#include "svq1.h"
#include "svq3.h"
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index 6c72dc8..366f857 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -27,6 +27,7 @@
#include "config.h"
#if CONFIG_ZLIB
+#define ZLIB_CONST
#include <zlib.h>
#endif
diff --git a/libavcodec/tiffenc.c b/libavcodec/tiffenc.c
index f450edb..86ed261 100644
--- a/libavcodec/tiffenc.c
+++ b/libavcodec/tiffenc.c
@@ -27,6 +27,7 @@
#include "config.h"
#if CONFIG_ZLIB
+#define ZLIB_CONST
#include <zlib.h>
#endif
diff --git a/libavcodec/tscc.c b/libavcodec/tscc.c
index c26853e..8f43773 100644
--- a/libavcodec/tscc.c
+++ b/libavcodec/tscc.c
@@ -37,13 +37,13 @@
#include <stdio.h>
#include <stdlib.h>
+#define ZLIB_CONST
+#include <zlib.h>
#include "avcodec.h"
#include "internal.h"
#include "msrledec.h"
-#include <zlib.h>
-
typedef struct TsccContext {
AVCodecContext *avctx;
diff --git a/libavcodec/zerocodec.c b/libavcodec/zerocodec.c
index eeba2de..128a132 100644
--- a/libavcodec/zerocodec.c
+++ b/libavcodec/zerocodec.c
@@ -16,6 +16,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#define ZLIB_CONST
#include <zlib.h>
#include "avcodec.h"
diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c
index d17f37a..a9ea48b 100644
--- a/libavcodec/zmbv.c
+++ b/libavcodec/zmbv.c
@@ -26,14 +26,14 @@
#include <stdio.h>
#include <stdlib.h>
+#define ZLIB_CONST
+#include <zlib.h>
#include "libavutil/common.h"
#include "libavutil/intreadwrite.h"
#include "avcodec.h"
#include "internal.h"
-#include <zlib.h>
-
#define ZMBV_KEYFRAME 1
#define ZMBV_DELTAPAL 2
diff --git a/libavcodec/zmbvenc.c b/libavcodec/zmbvenc.c
index 785ee0a..6b6100b 100644
--- a/libavcodec/zmbvenc.c
+++ b/libavcodec/zmbvenc.c
@@ -26,14 +26,14 @@
#include <stdio.h>
#include <stdlib.h>
+#define ZLIB_CONST
+#include <zlib.h>
#include "libavutil/common.h"
#include "libavutil/intreadwrite.h"
#include "avcodec.h"
#include "internal.h"
-#include <zlib.h>
-
#define ZMBV_KEYFRAME 1
#define ZMBV_DELTAPAL 2
diff --git a/libavformat/http.c b/libavformat/http.c
index bd75611..6772fbe 100644
--- a/libavformat/http.c
+++ b/libavformat/http.c
@@ -22,6 +22,7 @@
#include "config.h"
#if CONFIG_ZLIB
+#define ZLIB_CONST
#include <zlib.h>
#endif /* CONFIG_ZLIB */
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 22108ad..63d09ad 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -36,6 +36,7 @@
#include <bzlib.h>
#endif
#if CONFIG_ZLIB
+#define ZLIB_CONST
#include <zlib.h>
#endif
diff --git a/libavformat/mov.c b/libavformat/mov.c
index fdf9c8d..d863435 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -23,9 +23,15 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "config.h"
+
#include <inttypes.h>
#include <limits.h>
#include <stdint.h>
+#if CONFIG_ZLIB
+#define ZLIB_CONST
+#include <zlib.h>
+#endif
//#define MOV_EXPORT_ALL_METADATA
@@ -46,11 +52,6 @@
#include "id3v1.h"
#include "mov_chan.h"
#include "replaygain.h"
-
-#if CONFIG_ZLIB
-#include <zlib.h>
-#endif
-
#include "qtpalette.h"
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
index de09486..3f38c6b 100644
--- a/libavformat/rtmpproto.c
+++ b/libavformat/rtmpproto.c
@@ -24,6 +24,13 @@
* RTMP protocol
*/
+#include "config.h"
+
+#if CONFIG_ZLIB
+#define ZLIB_CONST
+#include <zlib.h>
+#endif
+
#include "libavcodec/bytestream.h"
#include "libavutil/avstring.h"
#include "libavutil/base64.h"
@@ -44,10 +51,6 @@
#include "rtmppkt.h"
#include "url.h"
-#if CONFIG_ZLIB
-#include <zlib.h>
-#endif
-
#define APP_MAX_LENGTH 128
#define PLAYPATH_MAX_LENGTH 256
#define TCURL_MAX_LENGTH 512
diff --git a/tools/cws2fws.c b/tools/cws2fws.c
index 74588c1..fcf0629 100644
--- a/tools/cws2fws.c
+++ b/tools/cws2fws.c
@@ -17,6 +17,7 @@
#if HAVE_IO_H
#include <io.h>
#endif
+#define ZLIB_CONST
#include <zlib.h>
#ifdef DEBUG
--
1.8.3.2
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
