diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-19 14:10:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-19 14:10:25 +0200 |
| commit | 7bdbd2653fddde6504644455dae4804daa8b393e (patch) | |
| tree | f924d4b58b3b1b9d4113a94697d7f95305aa43c2 | |
| parent | 776647360db37628ccfcaf9a624544b2be45eb7a (diff) | |
| parent | 1a583c0c60240adb8fa6620c6df33f1a0a0fe5d9 (diff) | |
| download | ffmpeg-7bdbd2653fddde6504644455dae4804daa8b393e.tar.gz | |
Merge commit '1a583c0c60240adb8fa6620c6df33f1a0a0fe5d9'
* commit '1a583c0c60240adb8fa6620c6df33f1a0a0fe5d9':
fdct: Move ppc-specific declarations to a header in the ppc directory
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/dct-test.c | 4 | ||||
| -rw-r--r-- | libavcodec/ppc/fdct.h (renamed from libavcodec/ppc/fdctdsp.h) | 6 | ||||
| -rw-r--r-- | libavcodec/ppc/fdctdsp.c | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c index 3a2c1acd51..1f2c53e80a 100644 --- a/libavcodec/dct-test.c +++ b/libavcodec/dct-test.c @@ -45,14 +45,12 @@ #include "aandcttab.h" #include "faandct.h" #include "faanidct.h" +#include "ppc/fdct.h" #include "x86/fdct.h" #include "x86/idct_xvid.h" #include "x86/simple_idct.h" #include "dctref.h" -// ALTIVEC -void ff_fdct_altivec(int16_t *block); - // ARM void ff_j_rev_dct_arm(int16_t *data); void ff_simple_idct_arm(int16_t *data); diff --git a/libavcodec/ppc/fdctdsp.h b/libavcodec/ppc/fdct.h index 89be76846f..437f815258 100644 --- a/libavcodec/ppc/fdctdsp.h +++ b/libavcodec/ppc/fdct.h @@ -16,11 +16,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_PPC_FDCTDSP_H -#define AVCODEC_PPC_FDCTDSP_H +#ifndef AVCODEC_PPC_FDCT_H +#define AVCODEC_PPC_FDCT_H #include <stdint.h> void ff_fdct_altivec(int16_t *block); -#endif /* AVCODEC_PPC_FDCTDSP_H */ +#endif /* AVCODEC_PPC_FDCT_H */ diff --git a/libavcodec/ppc/fdctdsp.c b/libavcodec/ppc/fdctdsp.c index 561e469ab8..c3ebe0d922 100644 --- a/libavcodec/ppc/fdctdsp.c +++ b/libavcodec/ppc/fdctdsp.c @@ -27,7 +27,7 @@ #include "libavutil/cpu.h" #include "libavutil/ppc/cpu.h" #include "libavcodec/fdctdsp.h" -#include "fdctdsp.h" +#include "fdct.h" #if HAVE_ALTIVEC |