diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2002-09-29 22:44:22 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2002-09-29 22:44:22 +0000 |
| commit | 2ad1516a6c7180d4f9343c0f07120eaec5130d6e (patch) | |
| tree | 38dfb52da33739e269f30177e8b46c86067dbc67 /libavcodec/dsputil.h | |
| parent | f9bb4bdffcbde7362db2a0e041a2893dde0ace6f (diff) | |
| download | ffmpeg-2ad1516a6c7180d4f9343c0f07120eaec5130d6e.tar.gz | |
idct permutation cleanup, idct can be selected per context now
fixing some threadunsafe code
Originally committed as revision 980 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/dsputil.h')
| -rw-r--r-- | libavcodec/dsputil.h | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index 736729f98a..1c04301457 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -34,12 +34,9 @@ void j_rev_dct (DCTELEM *data); void ff_fdct_mmx(DCTELEM *block); /* encoding scans */ -extern UINT8 ff_alternate_horizontal_scan[64]; -extern UINT8 ff_alternate_vertical_scan[64]; -extern UINT8 zigzag_direct[64]; - -/* permutation table */ -extern UINT8 permutation[64]; +extern const UINT8 ff_alternate_horizontal_scan[64]; +extern const UINT8 ff_alternate_vertical_scan[64]; +extern const UINT8 ff_zigzag_direct[64]; /* pixel operations */ #define MAX_NEG_CROP 384 @@ -61,9 +58,6 @@ i (michael) didnt check them, these are just the alignents which i think could b */ /* pixel ops : interface with DCT */ -extern void (*ff_idct)(DCTELEM *block/*align 16*/); -extern void (*ff_idct_put)(UINT8 *dest/*align 8*/, int line_size, DCTELEM *block/*align 16*/); -extern void (*ff_idct_add)(UINT8 *dest/*align 8*/, int line_size, DCTELEM *block/*align 16*/); extern void (*get_pixels)(DCTELEM *block/*align 16*/, const UINT8 *pixels/*align 8*/, int line_size); extern void (*diff_pixels)(DCTELEM *block/*align 16*/, const UINT8 *s1/*align 8*/, const UINT8 *s2/*align 8*/, int stride); extern void (*put_pixels_clamped)(const DCTELEM *block/*align 16*/, UINT8 *pixels/*align 8*/, int line_size); @@ -119,12 +113,7 @@ int pix_abs16x16_x2_c(UINT8 *blk1, UINT8 *blk2, int lx); int pix_abs16x16_y2_c(UINT8 *blk1, UINT8 *blk2, int lx); int pix_abs16x16_xy2_c(UINT8 *blk1, UINT8 *blk2, int lx); -static inline int block_permute_op(int j) -{ - return permutation[j]; -} - -void block_permute(INT16 *block); +void block_permute(INT16 *block, UINT8 *permutation); #if defined(HAVE_MMX) |