diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-19 19:28:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-19 19:28:29 +0200 |
| commit | cd7ae5af16d7fc718a34effea3e3fef09a1a8a2e (patch) | |
| tree | c044e273485972168043c8051b5d3407000647d0 /libavutil/display.c | |
| parent | 07941c2cb28d6a80f628e035d61ab437d9719bf0 (diff) | |
| parent | 82fc9f4b38244236a6ca7f946662ca653044a04c (diff) | |
| download | ffmpeg-cd7ae5af16d7fc718a34effea3e3fef09a1a8a2e.tar.gz | |
Merge commit '82fc9f4b38244236a6ca7f946662ca653044a04c'
* commit '82fc9f4b38244236a6ca7f946662ca653044a04c':
display: Include mathematics.h for fallback definition of NAN
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/display.c')
| -rw-r--r-- | libavutil/display.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavutil/display.c b/libavutil/display.c index ff3aa18deb..cc11536d36 100644 --- a/libavutil/display.c +++ b/libavutil/display.c @@ -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) |