Merge commit '82fc9f4b38244236a6ca7f946662ca653044a04c'

* commit '82fc9f4b38244236a6ca7f946662ca653044a04c':
  display: Include mathematics.h for fallback definition of NAN

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-05-19 19:28:25 +02:00
commit cd7ae5af16

View File

@ -23,6 +23,7 @@
#include <math.h>
#include "display.h"
#include "mathematics.h"
// fixed point to double
#define CONV_FP(x) ((double) (x)) / (1 << 16)