From 7c38076d4fb8be7eccdc7248b5f66c6dc615c261 Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Sat, 31 Mar 2007 21:28:43 +0000 Subject: [PATCH] fix INT64_C breakage with ffmpeg Originally committed to SVN as r967. --- aegisub/audio_provider_lavc.cpp | 9 +++++++++ aegisub/posix/defines.h | 1 + 2 files changed, 10 insertions(+) diff --git a/aegisub/audio_provider_lavc.cpp b/aegisub/audio_provider_lavc.cpp index 163355e67..60080647e 100644 --- a/aegisub/audio_provider_lavc.cpp +++ b/aegisub/audio_provider_lavc.cpp @@ -38,6 +38,15 @@ // Headers #define EMULATE_INTTYPES #include + +/* avcodec.h uses INT64_C in a *single* place. This prolly breaks on Win32, + * but, well. Let's at least fix it for Linux. + * +#define __STDC_CONSTANT_MACROS 1 +#include + * - done in posix/defines.h + */ + #include #include #include "mkv_wrap.h" diff --git a/aegisub/posix/defines.h b/aegisub/posix/defines.h index 654b58acc..a59ac8f9c 100644 --- a/aegisub/posix/defines.h +++ b/aegisub/posix/defines.h @@ -9,6 +9,7 @@ #include "acconf.h" #ifdef HAVE_STDINT_H +#define __STDC_CONSTANT_MACROS 1 #include #endif #ifdef HAVE_INTTYPES_H