diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-22 22:23:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-22 22:23:04 +0100 |
| commit | 672c610d8439ec7e83ba1e1d0c5ca2388cfccfc3 (patch) | |
| tree | 17a5bca7fe47fa6729fc3ec48cf9dee3ba37faa8 /libavcodec/mathops.h | |
| parent | d6d3cfb0aa23c1f6111f71889256874d86c2cf77 (diff) | |
| parent | f9279ee74936b4990fc46287c27816ef828cc06c (diff) | |
| download | ffmpeg-streaming-672c610d8439ec7e83ba1e1d0c5ca2388cfccfc3.zip ffmpeg-streaming-672c610d8439ec7e83ba1e1d0c5ca2388cfccfc3.tar.gz | |
Merge commit 'f9279ee74936b4990fc46287c27816ef828cc06c'
* commit 'f9279ee74936b4990fc46287c27816ef828cc06c':
dsputil: Move ff_zigzag_direct and ff_crop_tab declarations to mathops.h
Conflicts:
libavcodec/imgconvert.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mathops.h')
| -rw-r--r-- | libavcodec/mathops.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/mathops.h b/libavcodec/mathops.h index cc8ce55..b0e48d8 100644 --- a/libavcodec/mathops.h +++ b/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" |
