diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-09 13:40:03 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-09 13:40:03 +0100 |
| commit | 0af07495ecccaeff605e64444fa6d56d56a71358 (patch) | |
| tree | 2cc71da797b3a1248d74f59d01d5a7b64b2546ea /libavcodec/dsputil.h | |
| parent | e5670cb8a1c9467a4a31dcb10f31bf63e44aeb69 (diff) | |
| parent | 6a4430407404bfe55581e66a86a496c9adf6fb44 (diff) | |
Merge commit '6a4430407404bfe55581e66a86a496c9adf6fb44'
* commit '6a4430407404bfe55581e66a86a496c9adf6fb44':
dsputil: Move ff_h264_idct function declarations to a separate header
Conflicts:
libavcodec/dsputil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsputil.h')
| -rw-r--r-- | libavcodec/dsputil.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index 4dd45d8703..a5ace52114 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -53,26 +53,6 @@ void ff_fdct_mmx(int16_t *block); void ff_fdct_mmxext(int16_t *block); void ff_fdct_sse2(int16_t *block); -#define H264_IDCT(depth) \ -void ff_h264_idct8_add_ ## depth ## _c(uint8_t *dst, int16_t *block, int stride);\ -void ff_h264_idct_add_ ## depth ## _c(uint8_t *dst, int16_t *block, int stride);\ -void ff_h264_idct8_dc_add_ ## depth ## _c(uint8_t *dst, int16_t *block, int stride);\ -void ff_h264_idct_dc_add_ ## depth ## _c(uint8_t *dst, int16_t *block, int stride);\ -void ff_h264_idct_add16_ ## depth ## _c(uint8_t *dst, const int *blockoffset, int16_t *block, int stride, const uint8_t nnzc[6*8]);\ -void ff_h264_idct_add16intra_ ## depth ## _c(uint8_t *dst, const int *blockoffset, int16_t *block, int stride, const uint8_t nnzc[6*8]);\ -void ff_h264_idct8_add4_ ## depth ## _c(uint8_t *dst, const int *blockoffset, int16_t *block, int stride, const uint8_t nnzc[6*8]);\ -void ff_h264_idct_add8_422_ ## depth ## _c(uint8_t **dest, const int *blockoffset, int16_t *block, int stride, const uint8_t nnzc[6*8]);\ -void ff_h264_idct_add8_ ## depth ## _c(uint8_t **dest, const int *blockoffset, int16_t *block, int stride, const uint8_t nnzc[6*8]);\ -void ff_h264_luma_dc_dequant_idct_ ## depth ## _c(int16_t *output, int16_t *input, int qmul);\ -void ff_h264_chroma422_dc_dequant_idct_ ## depth ## _c(int16_t *block, int qmul);\ -void ff_h264_chroma_dc_dequant_idct_ ## depth ## _c(int16_t *block, int qmul); - -H264_IDCT( 8) -H264_IDCT( 9) -H264_IDCT(10) -H264_IDCT(12) -H264_IDCT(14) - void ff_svq3_luma_dc_dequant_idct_c(int16_t *output, int16_t *input, int qp); void ff_svq3_add_idct_c(uint8_t *dst, int16_t *block, int stride, int qp, int dc); |