Merge commit '1a583c0c60'

* commit '1a583c0c60':
  fdct: Move ppc-specific declarations to a header in the ppc directory

Merged-by: Michael Niedermayer <michaelni@gmx.at>

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);

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 */

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