diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-26 12:56:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-26 12:56:55 +0100 |
| commit | 9b1a0c2ee82f3b99584857db1ea662e2d08aca7f (patch) | |
| tree | aa364f6228cb3d925e35a718e58684fdced69002 /libavcodec/arm | |
| parent | 6fbddc80d63ddbc8974f4b2e286de20def6c201d (diff) | |
| parent | 76b19a3984359b3be44d4f7e4e69b7b86729a622 (diff) | |
Merge commit '76b19a3984359b3be44d4f7e4e69b7b86729a622'
* commit '76b19a3984359b3be44d4f7e4e69b7b86729a622':
Fix a number of incorrect intmath.h #includes.
avconv: remove an unused variable
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm')
| -rw-r--r-- | libavcodec/arm/dca.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/arm/dca.h b/libavcodec/arm/dca.h index 3b341cf3da..2cfd18a837 100644 --- a/libavcodec/arm/dca.h +++ b/libavcodec/arm/dca.h @@ -22,8 +22,9 @@ #define AVCODEC_ARM_DCA_H #include <stdint.h> + #include "config.h" -#include "libavutil/intmath.h" +#include "libavcodec/mathops.h" #if HAVE_ARMV6_INLINE && AV_GCC_VERSION_AT_LEAST(4,4) && !CONFIG_THUMB |