fix compilation error due to redefinition of macro

artclarke · Nov 18, 2018 · 35d4acf · 35d4acf
1 parent 1b7c277
commit 35d4acf
Show file tree

Hide file tree

Showing 2 changed files with 538 additions and 537 deletions.
diff --git a/humble-video-native/src/main/gnu/src/io/humble/video/FfmpegIncludes.h b/humble-video-native/src/main/gnu/src/io/humble/video/FfmpegIncludes.h
@@ -28,7 +28,9 @@ extern "C"
 // WARNING: This is GCC specific and is to fix a build issue
 // in FFmpeg where UINT64_C is not always defined.  The
 // __WORDSIZE value is a GCC constant
+#ifndef __STDC_CONSTANT_MACROS
 #define __STDC_CONSTANT_MACROS 1
+#endif // __STDC_CONSTANT_MACROS
 #include <stdint.h>
 #ifndef UINT64_C
 # if __WORDSIZE == 64
@@ -38,7 +40,6 @@ extern "C"
 # endif
 #endif
 
-
 #include <libavutil/avutil.h>
 #include <libavutil/common.h>
 #include <libavutil/pixdesc.h>