diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-09 14:42:06 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-09 14:45:45 +0100 |
commit | 5cfc0ae825e675ca9f629dfedac174477fc471e8 (patch) | |
tree | 32fafde3f65eb99cc965171a74694c03554b4302 /libavcodec/dsputil.h | |
parent | 6b2e65078c02cb1e09b555603a1eb10ddb3bd244 (diff) | |
parent | 5d3d39c72e57dca76c508a1c28036f8a2c1d8ad8 (diff) | |
download | ffmpeg-5cfc0ae825e675ca9f629dfedac174477fc471e8.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dsputil: Move fdct function declarations to dct.h
Conflicts:
libavcodec/dsputil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsputil.h')
-rw-r--r-- | libavcodec/dsputil.h | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index b1adeccc25..b772b7e56b 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -35,23 +35,6 @@ //#define DEBUG -/* dct code */ - -void ff_fdct_ifast(int16_t *data); -void ff_fdct_ifast248(int16_t *data); -void ff_jpeg_fdct_islow_8(int16_t *data); -void ff_jpeg_fdct_islow_10(int16_t *data); -void ff_fdct248_islow_8(int16_t *data); -void ff_fdct248_islow_10(int16_t *data); - -void ff_j_rev_dct(int16_t *data); -void ff_j_rev_dct4(int16_t *data); -void ff_j_rev_dct2(int16_t *data); -void ff_j_rev_dct1(int16_t *data); - -void ff_fdct_mmx(int16_t *block); -void ff_fdct_mmxext(int16_t *block); -void ff_fdct_sse2(int16_t *block); /* encoding scans */ extern const uint8_t ff_alternate_horizontal_scan[64]; |