mirror of https://github.com/odrling/Aegisub
fix INT64_C breakage with ffmpeg
Originally committed to SVN as r967.
This commit is contained in:
parent
af7bfcc858
commit
7c38076d4f
|
@ -38,6 +38,15 @@
|
||||||
// Headers
|
// Headers
|
||||||
#define EMULATE_INTTYPES
|
#define EMULATE_INTTYPES
|
||||||
#include <wx/wxprec.h>
|
#include <wx/wxprec.h>
|
||||||
|
|
||||||
|
/* 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 <stdint.h>
|
||||||
|
* - done in posix/defines.h
|
||||||
|
*/
|
||||||
|
|
||||||
#include <ffmpeg/avcodec.h>
|
#include <ffmpeg/avcodec.h>
|
||||||
#include <ffmpeg/avformat.h>
|
#include <ffmpeg/avformat.h>
|
||||||
#include "mkv_wrap.h"
|
#include "mkv_wrap.h"
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
#include "acconf.h"
|
#include "acconf.h"
|
||||||
|
|
||||||
#ifdef HAVE_STDINT_H
|
#ifdef HAVE_STDINT_H
|
||||||
|
#define __STDC_CONSTANT_MACROS 1
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#endif
|
#endif
|
||||||
#ifdef HAVE_INTTYPES_H
|
#ifdef HAVE_INTTYPES_H
|
||||||
|
|
Loading…
Reference in New Issue