diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-03 03:55:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-03 04:09:38 +0200 |
| commit | 5b58d79a99658200ee5562999b16b5a8fa729b22 (patch) | |
| tree | bd10ed2708d7485f5156c4e67f8325bcff5bd999 /libavcodec/xvididct.h | |
| parent | 5db23c07a3f76d31e8e3178f8bacb68289bba62b (diff) | |
| parent | 7a1d6ddd2c6b2d66fbc1afa584cf506930a26453 (diff) | |
| download | ffmpeg-5b58d79a99658200ee5562999b16b5a8fa729b22.tar.gz | |
Merge commit '7a1d6ddd2c6b2d66fbc1afa584cf506930a26453'
* commit '7a1d6ddd2c6b2d66fbc1afa584cf506930a26453':
xvid: Add C IDCT
Conflicts:
libavcodec/dct-test.c
libavcodec/xvididct.c
See: 298b3b6c1f8f66b9bc6de53a7b51d3de745d946b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/xvididct.h')
| -rw-r--r-- | libavcodec/xvididct.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libavcodec/xvididct.h b/libavcodec/xvididct.h index b0233c342c..f7dfba4886 100644 --- a/libavcodec/xvididct.h +++ b/libavcodec/xvididct.h @@ -19,13 +19,16 @@ #ifndef AVCODEC_XVIDIDCT_H #define AVCODEC_XVIDIDCT_H +#include <stdint.h> + #include "avcodec.h" #include "idctdsp.h" -void ff_xvid_idct_init(IDCTDSPContext *c, AVCodecContext *avctx); +void ff_xvid_idct(int16_t *const in); -void ff_xvid_idct_init_x86(IDCTDSPContext *c); +void ff_xvid_idct_init(IDCTDSPContext *c, AVCodecContext *avctx); -void ff_idct_xvid(int16_t *const In); +void ff_xvid_idct_init_x86(IDCTDSPContext *c, AVCodecContext *avctx, + unsigned high_bit_depth); #endif /* AVCODEC_XVIDIDCT_H */ |