summaryrefslogtreecommitdiffstats
path: root/chromium/third_party/ffmpeg/libavcodec/mathops.h
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/ffmpeg/libavcodec/mathops.h')
-rw-r--r--chromium/third_party/ffmpeg/libavcodec/mathops.h13
1 files changed, 4 insertions, 9 deletions
diff --git a/chromium/third_party/ffmpeg/libavcodec/mathops.h b/chromium/third_party/ffmpeg/libavcodec/mathops.h
index bad25afd45b..b0e48d89198 100644
--- a/chromium/third_party/ffmpeg/libavcodec/mathops.h
+++ b/chromium/third_party/ffmpeg/libavcodec/mathops.h
@@ -27,9 +27,13 @@
#include "libavutil/common.h"
#include "config.h"
+#define MAX_NEG_CROP 1024
+
extern const uint32_t ff_inverse[257];
extern const uint8_t ff_reverse[256];
extern const uint8_t ff_sqrt_tab[256];
+extern const uint8_t ff_crop_tab[256 + 2 * MAX_NEG_CROP];
+extern const uint8_t ff_zigzag_direct[64];
#if ARCH_ARM
# include "arm/mathops.h"
@@ -195,15 +199,6 @@ if ((y) < (x)) {\
# define FASTDIV(a,b) ((uint32_t)((((uint64_t)a) * ff_inverse[b]) >> 32))
#endif /* FASTDIV */
-#ifndef MOD_UNLIKELY
-# define MOD_UNLIKELY(modulus, dividend, divisor, prev_dividend) \
- do { \
- if ((prev_dividend) == 0 || (dividend) - (prev_dividend) != (divisor)) \
- (modulus) = (dividend) % (divisor); \
- (prev_dividend) = (dividend); \
- } while (0)
-#endif
-
static inline av_const unsigned int ff_sqrt(unsigned int a)
{
unsigned int b;