diff options
Diffstat (limited to 'third_party/ffmpeg')
| -rwxr-xr-x | third_party/ffmpeg/ffmpeg.gyp | 5 | ||||
| -rw-r--r-- | third_party/ffmpeg/include/win/stdint.h | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/third_party/ffmpeg/ffmpeg.gyp b/third_party/ffmpeg/ffmpeg.gyp index e031c27..ff066f1 100755 --- a/third_party/ffmpeg/ffmpeg.gyp +++ b/third_party/ffmpeg/ffmpeg.gyp @@ -92,7 +92,7 @@ 'avcodec-52.dll', 'avformat-52.dll', 'avutil-50.dll', - ], + ], }, }, }, @@ -131,6 +131,9 @@ '../..', # The chromium 'src' directory. ], 'direct_dependent_settings': { + 'defines': [ + '__STDC_CONSTANT_MACROS', # FFmpeg uses INT64_C. + ], 'include_dirs': [ '<(output_root)', '../..', # The chromium 'src' directory. diff --git a/third_party/ffmpeg/include/win/stdint.h b/third_party/ffmpeg/include/win/stdint.h index 280bdb1..90bb029 100644 --- a/third_party/ffmpeg/include/win/stdint.h +++ b/third_party/ffmpeg/include/win/stdint.h @@ -23,4 +23,9 @@ typedef unsigned short uint16_t; typedef unsigned int uint32_t; typedef unsigned long long uint64_t; +// Define the C99 INT64_C macro that is used for declaring 64-bit literals. +// Technically, these should only be definied when __STDC_CONSTANT_MACROS +// is defined. +#define INT64_C(value) value##LL + #endif // THIRD_PARTY_FFMPEG_INCLUDE_WIN_STDINT_H_ |