diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-05-22 02:01:47 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-05-22 02:01:47 +0400 |
| commit | dbcb73c033fc15fc0df2ab0a05ac0b2c4a9a31b1 (patch) | |
| tree | 630247e3c4b18a799545bee8de23ee075cfa5a79 /intern/audaspace | |
| parent | f76c3aa3764283918413a50ed9dab079e720ed98 (diff) | |
| parent | c0a0f2c43e934e2054eefe5bf90889cf67b736f9 (diff) | |
Merged changes in the trunk up to revision 28911.
Diffstat (limited to 'intern/audaspace')
| -rw-r--r-- | intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp | 3 | ||||
| -rw-r--r-- | intern/audaspace/intern/AUD_C-API.cpp | 6 | ||||
| -rw-r--r-- | intern/audaspace/intern/AUD_FileFactory.cpp | 3 |
3 files changed, 12 insertions, 0 deletions
diff --git a/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp b/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp index f67c819ff10..8e71c97baec 100644 --- a/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp +++ b/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp @@ -23,6 +23,9 @@ * ***** END LGPL LICENSE BLOCK ***** */ +// needed for INT64_C +#define __STDC_CONSTANT_MACROS + #include "AUD_FFMPEGFactory.h" #include "AUD_FFMPEGReader.h" #include "AUD_Buffer.h" diff --git a/intern/audaspace/intern/AUD_C-API.cpp b/intern/audaspace/intern/AUD_C-API.cpp index 32cfd2098b0..8740f62c9a7 100644 --- a/intern/audaspace/intern/AUD_C-API.cpp +++ b/intern/audaspace/intern/AUD_C-API.cpp @@ -27,6 +27,11 @@ #include <cstring> #include <cmath> +#ifdef WITH_FFMPEG +// needed for INT64_C +#define __STDC_CONSTANT_MACROS +#endif + #include "AUD_NULLDevice.h" #include "AUD_I3DDevice.h" #include "AUD_FileFactory.h" @@ -62,6 +67,7 @@ #include "AUD_JackDevice.h" #endif + #ifdef WITH_FFMPEG extern "C" { #include <libavformat/avformat.h> diff --git a/intern/audaspace/intern/AUD_FileFactory.cpp b/intern/audaspace/intern/AUD_FileFactory.cpp index b63390803b1..5888479a0ba 100644 --- a/intern/audaspace/intern/AUD_FileFactory.cpp +++ b/intern/audaspace/intern/AUD_FileFactory.cpp @@ -29,6 +29,9 @@ #include <cstring> #ifdef WITH_FFMPEG +// needed for INT64_C +#define __STDC_CONSTANT_MACROS + #include "AUD_FFMPEGReader.h" #endif #ifdef WITH_SNDFILE |