mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-28 20:53:54 +02:00
Merge commit '1a583c0c60240adb8fa6620c6df33f1a0a0fe5d9'
* commit '1a583c0c60240adb8fa6620c6df33f1a0a0fe5d9': fdct: Move ppc-specific declarations to a header in the ppc directory Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
7bdbd2653f
@ -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);
|
||||
|
@ -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 */
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user