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/dsputil.h | |
| parent | d6d3cfb0aa23c1f6111f71889256874d86c2cf77 (diff) | |
| parent | f9279ee74936b4990fc46287c27816ef828cc06c (diff) | |
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/dsputil.h')
| -rw-r--r-- | libavcodec/dsputil.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index 4e16c92bde..8f83006006 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -36,16 +36,11 @@ /* encoding scans */ extern const uint8_t ff_alternate_horizontal_scan[64]; extern const uint8_t ff_alternate_vertical_scan[64]; -extern const uint8_t ff_zigzag_direct[64]; extern const uint8_t ff_zigzag248_direct[64]; -/* pixel operations */ -#define MAX_NEG_CROP 1024 - -/* temporary */ extern uint32_t ff_square_tab[512]; -extern const uint8_t ff_crop_tab[256 + 2 * MAX_NEG_CROP]; +/* pixel operations */ void ff_put_pixels8x8_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride); void ff_avg_pixels8x8_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride); void ff_put_pixels16x16_c(uint8_t *dst, uint8_t *src, ptrdiff_t stride); |