diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-02 00:12:38 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-02 00:43:09 +0400 |
commit | 5eb353e0cd62ad212634c14e4b863554c0bc6161 (patch) | |
tree | 0f53c933b7a61bf14553c3ab8abb8226bd9c23bb /libavutil/opt.c | |
parent | 23eeffcd48a15e73fb2649b712870b6d101c5471 (diff) | |
parent | 3893feeccdf754057fc7c7ac711ae876733f2f33 (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
opt/eval: Include mathematics.h for NAN/INFINITY
mathematics: Don't use division by zero in NAN/INFINITY macros
wma: Lower the maximum number of channels to 2
x86: cpu: clean up check for cpuid instruction support
ARM: generate position independent code to access data symbols
Conflicts:
libavutil/opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/opt.c')
-rw-r--r-- | libavutil/opt.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavutil/opt.c b/libavutil/opt.c index ab81b1f11f..cdd52768da 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -33,6 +33,7 @@ #include "log.h" #include "parseutils.h" #include "pixdesc.h" +#include "mathematics.h" #if FF_API_FIND_OPT //FIXME order them and do a bin search |