diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-19 13:56:08 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-19 13:56:29 +0200 |
commit | 776647360db37628ccfcaf9a624544b2be45eb7a (patch) | |
tree | 540ad3ad2b6e8793bc50e7d8e9708fe473c924ca /libavcodec/simple_idct.h | |
parent | 6da96a9fc9cf423994eb6b16c241788c759444f4 (diff) | |
parent | 5dcc201505f71b1e73e9eef12ce89d4eed252ad0 (diff) | |
download | ffmpeg-776647360db37628ccfcaf9a624544b2be45eb7a.tar.gz |
Merge commit '5dcc201505f71b1e73e9eef12ce89d4eed252ad0'
* commit '5dcc201505f71b1e73e9eef12ce89d4eed252ad0':
simple_idct: Move x86-specific declarations to a header in the x86 directory
Conflicts:
libavcodec/x86/simple_idct.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/simple_idct.h')
-rw-r--r-- | libavcodec/simple_idct.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libavcodec/simple_idct.h b/libavcodec/simple_idct.h index 7c0734b836..154e297470 100644 --- a/libavcodec/simple_idct.h +++ b/libavcodec/simple_idct.h @@ -49,10 +49,6 @@ void ff_simple_idct_12(int16_t *block); */ void ff_prores_idct(int16_t *block, const int16_t *qmat); -void ff_simple_idct_mmx(int16_t *block); -void ff_simple_idct_add_mmx(uint8_t *dest, int line_size, int16_t *block); -void ff_simple_idct_put_mmx(uint8_t *dest, int line_size, int16_t *block); - void ff_simple_idct248_put(uint8_t *dest, int line_size, int16_t *block); void ff_simple_idct84_add(uint8_t *dest, int line_size, int16_t *block); |