Merge commit '82fc9f4b38244236a6ca7f946662ca653044a04c'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 19 May 2014 17:28:25 +0000 (19:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 19 May 2014 17:28:29 +0000 (19:28 +0200)
* commit '82fc9f4b38244236a6ca7f946662ca653044a04c':
  display: Include mathematics.h for fallback definition of NAN

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/display.c

index ff3aa18..cc11536 100644 (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)