From dc7cb06ae0f1a24ca0aa106eacc332ceba518928 Mon Sep 17 00:00:00 2001
From: Dan Christiansen <danchr@daimi.au.dk>
Date: Sun, 19 Oct 2003 21:05:41 +0000
Subject: [PATCH] gcc->C99 and warning fixes patch by (Dan Christiansen <danchr
at daimi dot au dot dk>)
Originally committed as revision 2399 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/avcodec.h | 4 ++--
libavcodec/common.h | 4 ++--
libavcodec/dvdata.h | 2 +-
libavcodec/ffv1.c | 2 +-
libavcodec/interplayvideo.c | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 90834f1ffe0..271561c79f3 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -208,8 +208,8 @@ extern int motion_estimation_method;
/* ME algos sorted by quality */
//FIXME remove IMHO
-static const int Motion_Est_QTab[] = { ME_ZERO, ME_PHODS, ME_LOG,
- ME_X1, ME_EPZS, ME_FULL };
+static const __attribute__((unused)) int Motion_Est_QTab[] =
+ { ME_ZERO, ME_PHODS, ME_LOG, ME_X1, ME_EPZS, ME_FULL };
#define FF_MAX_B_FRAMES 8
diff --git a/libavcodec/common.h b/libavcodec/common.h
index d9df5142634..7149ef80854 100644
--- a/libavcodec/common.h
+++ b/libavcodec/common.h
@@ -185,9 +185,9 @@ inline void dprintf(const char* fmt,...) {}
# else
# ifdef DEBUG
-# define dprintf(fmt,args...) printf(fmt, ## args)
+# define dprintf(fmt,...) printf(fmt, __VA_ARGS__)
# else
-# define dprintf(fmt,args...)
+# define dprintf(fmt,...)
# endif
# endif /* !CONFIG_WIN32 */
diff --git a/libavcodec/dvdata.h b/libavcodec/dvdata.h
index 43297de244d..16b5786a862 100644
--- a/libavcodec/dvdata.h
+++ b/libavcodec/dvdata.h
@@ -1293,7 +1293,7 @@ static const uint16_t dv_audio_shuffle625[12][9] = {
{ 31, 67, 103, 21, 57, 93, 11, 47, 83},
};
-static const int dv_audio_frequency[3] = {
+static const __attribute__((unused)) int dv_audio_frequency[3] = {
48000, 44100, 32000,
};
diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
index a5c83001635..2ff994e53d6 100644
--- a/libavcodec/ffv1.c
+++ b/libavcodec/ffv1.c
@@ -21,7 +21,7 @@
/**
* @file ffv1.c
- * FF Video Codec 1 (a experimental lossless codec)
+ * FF Video Codec 1 (an experimental lossless codec)
*/
#include "common.h"
diff --git a/libavcodec/interplayvideo.c b/libavcodec/interplayvideo.c
index 7f54e5d0465..a8a7c0f5620 100644
--- a/libavcodec/interplayvideo.c
+++ b/libavcodec/interplayvideo.c
@@ -876,7 +876,7 @@ static int ipvideo_decode_init(AVCodecContext *avctx)
if (s->avctx->extradata_size != sizeof(AVPaletteControl)) {
printf (" Interplay video: expected extradata_size of %d\n",
- sizeof(AVPaletteControl));
+ (int)sizeof(AVPaletteControl));
return -1;
}
--
GitLab