diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-21 16:03:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-21 16:13:55 +0200 |
| commit | aa760b1735907d256758ee67daa64f1e3b09bf0c (patch) | |
| tree | 2125e1e90ba68d853d732566d83c48a54999e93a /libavutil/intmath.h | |
| parent | 99ea47fe5a554126c2ddaccac42979e49d891aa4 (diff) | |
| parent | 2d09b36c0379fcda8f984bc8ad8816c8326fd7bd (diff) | |
Merge commit '2d09b36c0379fcda8f984bc8ad8816c8326fd7bd'
* commit '2d09b36c0379fcda8f984bc8ad8816c8326fd7bd':
doc/platform: Add info on shared builds with MSVC
doc/platform: Move a caveat down to the notes section
ARM: reinstate optimised intmath.h
ffv1: update to ffv1 version 3
Conflicts:
doc/platform.texi
libavcodec/ffv1.c
libavcodec/ffv1.h
libavcodec/ffv1dec.c
libavcodec/ffv1enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/intmath.h')
| -rw-r--r-- | libavutil/intmath.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavutil/intmath.h b/libavutil/intmath.h index 1e58cfba73..9002442bef 100644 --- a/libavutil/intmath.h +++ b/libavutil/intmath.h @@ -26,6 +26,10 @@ #include "config.h" #include "attributes.h" +#if ARCH_ARM +# include "arm/intmath.h" +#endif + /** * @addtogroup lavu_internal * @{ |