Commit 77f2cd65 authored by Max Kellermann's avatar Max Kellermann

Merge branch 'v0.18.x'

parents baad86bc d16fb797
......@@ -69,6 +69,8 @@ ver 0.18.13 (not yet released)
* decoder
- dsdiff, dsf: fix endless loop on malformed file
- ffmpeg: support ffmpeg/libav version 11
* fix state file saver
* fix build failure on Darwin
ver 0.18.12 (2014/07/30)
* database
......
......@@ -51,5 +51,6 @@ TimeoutMonitor::ScheduleSeconds(unsigned s)
void
TimeoutMonitor::Run()
{
active = true;
OnTimeout();
}
......@@ -40,6 +40,16 @@
/* well-known big-endian */
# define IS_LITTLE_ENDIAN false
# define IS_BIG_ENDIAN true
#elif defined(__APPLE__)
/* compile-time check for MacOS */
# include <machine/endian.h>
# if BYTE_ORDER == LITTLE_ENDIAN
# define IS_LITTLE_ENDIAN true
# define IS_BIG_ENDIAN false
# else
# define IS_LITTLE_ENDIAN false
# define IS_BIG_ENDIAN true
# endif
#else
/* generic compile-time check */
# include <endian.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment