3 files changed, 21 insertions, 5 deletions
diff --git a/src/libffmpeg/libavcodec/common.h b/src/libffmpeg/libavcodec/common.h
index aeb9ab52b..8ea58b2e7 100644
--- a/src/libffmpeg/libavcodec/common.h
+++ b/src/libffmpeg/libavcodec/common.h
@@ -298,7 +298,7 @@ void print_stats(void);
 
 /* misc math functions */
 
-extern inline int av_log2(unsigned int v)
+static inline int av_log2(unsigned int v)
 {
     int n;
 
diff --git a/src/libffmpeg/libavcodec/mjpeg.c b/src/libffmpeg/libavcodec/mjpeg.c
index 1103e11d0..391ce7d23 100644
--- a/src/libffmpeg/libavcodec/mjpeg.c
+++ b/src/libffmpeg/libavcodec/mjpeg.c
@@ -424,9 +424,17 @@ void mjpeg_encode_mb(MpegEncContext *s,
 #ifndef CONFIG_WIN32
 
 #ifdef DEBUG
-#define dprintf(fmt,args...) printf(fmt, ## args)
+# if __GNUC_
+#  define dprintf(fmt,args...) printf(fmt, ## args)
+# else
+#  define dprintf(...)	       printf(__VA_ARGS__)
+# endif
 #else
-#define dprintf(fmt,args...)
+# if __GNUC__
+#  define dprintf(fmt,args...)
+# else
+#  define dprintf(...)
+# endif
 #endif
 
 #else
diff --git a/src/libffmpeg/libavcodec/mpeg12.c b/src/libffmpeg/libavcodec/mpeg12.c
index f0aecd980..00183c22d 100644
--- a/src/libffmpeg/libavcodec/mpeg12.c
+++ b/src/libffmpeg/libavcodec/mpeg12.c
@@ -27,9 +27,17 @@
 #ifndef CONFIG_WIN32
 
 #ifdef DEBUG
-#define dprintf(fmt,args...) printf(fmt, ## args)
+# if __GNUC_
+#  define dprintf(fmt,args...) printf(fmt, ## args)
+# else
+#  define dprintf(...)	       printf(__VA_ARGS__)
+# endif
 #else
-#define dprintf(fmt,args...)
+# if __GNUC__
+#  define dprintf(fmt,args...)
+# else
+#  define dprintf(...)
+# endif
 #endif
 
 #else