virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

ppc: Move AltiVec utility headers out of AltiVec ifdefs

Browse Source 
Now that the headers themselves have ifdef protection this is no
longer necessary and more consistent with normal include handling.
This commit is contained in:
Diego Biurrun
2013-04-27 00:37:32 +02:00
parent f5eecee865
commit a053dbfcfb
4 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/ppc/h264chroma_init.c
View File

@@ -20,15 +20,14 @@
#include "config.h" #include "config.h"
#include "libavutil/attributes.h" #include "libavutil/attributes.h"
#include "libavcodec/h264chroma.h"
#if HAVE_ALTIVEC
#include "libavutil/cpu.h" #include "libavutil/cpu.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/types_altivec.h"
#include "libavutil/ppc/util_altivec.h" #include "libavutil/ppc/util_altivec.h"
#include "libavcodec/h264chroma.h"
#include "dsputil_altivec.h" #include "dsputil_altivec.h"
#if HAVE_ALTIVEC
#define PUT_OP_U8_ALTIVEC(d, s, dst) d = s #define PUT_OP_U8_ALTIVEC(d, s, dst) d = s
#define AVG_OP_U8_ALTIVEC(d, s, dst) d = vec_avg(dst, s) #define AVG_OP_U8_ALTIVEC(d, s, dst) d = vec_avg(dst, s)

6
libavcodec/ppc/h264qpel.c
View File

@@ -20,15 +20,15 @@
#include "config.h" #include "config.h"
#include "libavutil/attributes.h" #include "libavutil/attributes.h"
#include "libavcodec/h264qpel.h"
#if HAVE_ALTIVEC
#include "libavutil/cpu.h" #include "libavutil/cpu.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/types_altivec.h"
#include "libavutil/ppc/util_altivec.h" #include "libavutil/ppc/util_altivec.h"
#include "libavcodec/h264qpel.h"
#include "dsputil_altivec.h" #include "dsputil_altivec.h"
#if HAVE_ALTIVEC
#define PUT_OP_U8_ALTIVEC(d, s, dst) d = s #define PUT_OP_U8_ALTIVEC(d, s, dst) d = s
#define AVG_OP_U8_ALTIVEC(d, s, dst) d = vec_avg(dst, s) #define AVG_OP_U8_ALTIVEC(d, s, dst) d = vec_avg(dst, s)

9
libavcodec/ppc/hpeldsp_altivec.c
View File

@@ -21,18 +21,19 @@
*/ */
#include "config.h" #include "config.h"
#include "libavutil/attributes.h"
#include "libavutil/cpu.h"
#include "libavcodec/hpeldsp.h"
#if HAVE_ALTIVEC
#if HAVE_ALTIVEC_H #if HAVE_ALTIVEC_H
#include <altivec.h> #include <altivec.h>
#endif #endif
#include "libavutil/attributes.h"
#include "libavutil/cpu.h"
#include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/types_altivec.h"
#include "libavutil/ppc/util_altivec.h" #include "libavutil/ppc/util_altivec.h"
#include "libavcodec/hpeldsp.h"
#include "dsputil_altivec.h" #include "dsputil_altivec.h"
#if HAVE_ALTIVEC
/* next one assumes that ((line_size % 16) == 0) */ /* next one assumes that ((line_size % 16) == 0) */
void ff_put_pixels16_altivec(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h) void ff_put_pixels16_altivec(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h)
{ {

7
libavcodec/ppc/vp3dsp_altivec.c
View File

@@ -23,14 +23,13 @@
#include "config.h" #include "config.h"
#include "libavutil/attributes.h" #include "libavutil/attributes.h"
#include "libavutil/cpu.h" #include "libavutil/cpu.h"
#include "libavcodec/vp3dsp.h"
#if HAVE_ALTIVEC
#include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/types_altivec.h"
#include "libavutil/ppc/util_altivec.h" #include "libavutil/ppc/util_altivec.h"
#include "libavcodec/vp3dsp.h"
#include "dsputil_altivec.h" #include "dsputil_altivec.h"
#if HAVE_ALTIVEC
static const vec_s16 constants = static const vec_s16 constants =
{0, 64277, 60547, 54491, 46341, 36410, 25080, 12785}; {0, 64277, 60547, 54491, 46341, 36410, 25080, 12785};
static const vec_u8 interleave_high = static const vec_u8 interleave_high =