diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-20 18:20:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-20 18:31:45 +0200 |
| commit | 7c6c4cf2fb48d7469170e1fc5d9096b95e9b7e9f (patch) | |
| tree | ebcb01edc8a350bbd4315c38a98a31a1e1694f64 /libavcodec/dsputil.h | |
| parent | 045ef52ef513973a134f95c10a33f9ccb89ec92f (diff) | |
| parent | 7b4ee3a21d7c7419b485bf7af3b2795b9c3e89ea (diff) | |
| download | ffmpeg-7c6c4cf2fb48d7469170e1fc5d9096b95e9b7e9f.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Remove h264_lowres_idct_put/add functions
Remove snow/dwt test program
h264: remove some disabled code
Fix incorrect max_lowres values
matroskadec: fix integer underflow if header length < probe length.
cosmetics: indentation
eac3enc: use frame exponent strategy when applicable.
cosmetics: rename eac3dec_data.c/h to eac3_data.c/h since the tables will also be used in the E-AC-3 encoder.
dsputil: fix ff_check_alignment()
Conflicts:
libavcodec/Makefile
libavcodec/h264idct_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsputil.h')
| -rw-r--r-- | libavcodec/dsputil.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index 2579bea91b..cf0fa7274a 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -58,8 +58,6 @@ void ff_h264_idct8_add_ ## depth ## _c(uint8_t *dst, DCTELEM *block, int stride) void ff_h264_idct_add_ ## depth ## _c(uint8_t *dst, DCTELEM *block, int stride);\ void ff_h264_idct8_dc_add_ ## depth ## _c(uint8_t *dst, DCTELEM *block, int stride);\ void ff_h264_idct_dc_add_ ## depth ## _c(uint8_t *dst, DCTELEM *block, int stride);\ -void ff_h264_lowres_idct_add_ ## depth ## _c(uint8_t *dst, int stride, DCTELEM *block);\ -void ff_h264_lowres_idct_put_ ## depth ## _c(uint8_t *dst, int stride, DCTELEM *block);\ void ff_h264_idct_add16_ ## depth ## _c(uint8_t *dst, const int *blockoffset, DCTELEM *block, int stride, const uint8_t nnzc[6*8]);\ void ff_h264_idct_add16intra_ ## depth ## _c(uint8_t *dst, const int *blockoffset, DCTELEM *block, int stride, const uint8_t nnzc[6*8]);\ void ff_h264_idct8_add4_ ## depth ## _c(uint8_t *dst, const int *blockoffset, DCTELEM *block, int stride, const uint8_t nnzc[6*8]);\ |