1. ffmpeg
  2. Commit 172b0e2e88832822632841e8e0d3794f974cbc93
Browse code

Merge commit 'ea7ee4b4e381e0fa731458de0cbf740430eeb013'

* commit 'ea7ee4b4e381e0fa731458de0cbf740430eeb013':
ppc: Centralize compiler-specific altivec.h #include handling in one place

Merged-by: Clément Bœsch <u@pkh.me>

Clément Bœsch authored on 2017/04/26 23:21:00
Showing 28 changed files
libavcodec/ppc/audiodsp.c
History View file @ 172b0e2
... ... 
@@ -24,15 +24,12 @@
24 24 
  */
25 25
26 26 
 #include "config.h"
27 
-#if HAVE_ALTIVEC_H
28 
-#include <altivec.h>
29 
-#endif
30 27
31 28 
 #include "libavutil/attributes.h"
32 29 
 #include "libavutil/cpu.h"
33 30 
 #include "libavutil/ppc/cpu.h"
34 
-#include "libavutil/ppc/types_altivec.h"
35 31 
 #include "libavutil/ppc/util_altivec.h"
32 
+
36 33 
 #include "libavcodec/audiodsp.h"
37 34
38 35 
 #if HAVE_ALTIVEC
libavcodec/ppc/blockdsp.c
History View file @ 172b0e2
... ... 
@@ -21,16 +21,15 @@
21 21 
  */
22 22
23 23 
 #include "config.h"
24 
-#if HAVE_ALTIVEC_H
25 
-#include <altivec.h>
26 
-#endif
24 
+
27 25 
 #include <string.h>
28 26
29 27 
 #include "libavutil/attributes.h"
30 28 
 #include "libavutil/cpu.h"
31 29 
 #include "libavutil/mem.h"
32 30 
 #include "libavutil/ppc/cpu.h"
33 
-#include "libavutil/ppc/types_altivec.h"
31 
+#include "libavutil/ppc/util_altivec.h"
32 
+
34 33 
 #include "libavcodec/blockdsp.h"
35 34
36 35 
 /* ***** WARNING ***** WARNING ***** WARNING ***** */
libavcodec/ppc/fdctdsp.c
History View file @ 172b0e2
... ... 
@@ -19,14 +19,14 @@
19 19 
  */
20 20
21 21 
 #include "config.h"
22 
-#if HAVE_ALTIVEC_H
23 
-#include <altivec.h>
24 
-#endif
25 22
26 23 
 #include "libavutil/attributes.h"
27 24 
 #include "libavutil/cpu.h"
28 25 
 #include "libavutil/ppc/cpu.h"
26 
+#include "libavutil/ppc/util_altivec.h"
27 
+
29 28 
 #include "libavcodec/fdctdsp.h"
29 
+
30 30 
 #include "fdct.h"
31 31
32 32 
 #if HAVE_ALTIVEC
libavcodec/ppc/fft_init.c
History View file @ 172b0e2
... ... 
@@ -23,7 +23,6 @@
23 23 
 #include "config.h"
24 24 
 #include "libavutil/cpu.h"
25 25 
 #include "libavutil/ppc/cpu.h"
26 
-#include "libavutil/ppc/types_altivec.h"
27 26 
 #include "libavutil/ppc/util_altivec.h"
28 27 
 #include "libavcodec/fft.h"
29 28
libavcodec/ppc/fft_vsx.c
History View file @ 172b0e2
... ... 
@@ -25,7 +25,6 @@
25 25
26 26 
 #include "config.h"
27 27 
 #include "libavutil/cpu.h"
28 
-#include "libavutil/ppc/types_altivec.h"
29 28 
 #include "libavutil/ppc/util_altivec.h"
30 29 
 #include "libavcodec/fft.h"
31 30 
 #include "libavcodec/fft-internal.h"
libavcodec/ppc/fft_vsx.h
History View file @ 172b0e2
... ... 
@@ -27,7 +27,6 @@
27 27
28 28 
 #include "config.h"
29 29 
 #include "libavutil/cpu.h"
30 
-#include "libavutil/ppc/types_altivec.h"
31 30 
 #include "libavutil/ppc/util_altivec.h"
32 31 
 #include "libavcodec/fft.h"
33 32 
 #include "libavcodec/fft-internal.h"
libavcodec/ppc/h264chroma_init.c
History View file @ 172b0e2
... ... 
@@ -19,12 +19,13 @@
19 19 
  */
20 20
21 21 
 #include "config.h"
22 
+
22 23 
 #include "libavutil/attributes.h"
23 24 
 #include "libavutil/cpu.h"
24 25 
 #include "libavutil/intreadwrite.h"
25 26 
 #include "libavutil/ppc/cpu.h"
26 
-#include "libavutil/ppc/types_altivec.h"
27 27 
 #include "libavutil/ppc/util_altivec.h"
28 
+
28 29 
 #include "libavcodec/h264chroma.h"
29 30
30 31 
 #if HAVE_ALTIVEC
libavcodec/ppc/h264chroma_template.c
History View file @ 172b0e2
... ... 
@@ -19,7 +19,6 @@
19 19 
  */
20 20
21 21 
 #include "libavutil/mem.h"
22 
-#include "libavutil/ppc/types_altivec.h"
23 22 
 #include "libavutil/ppc/util_altivec.h"
24 23
25 24 
 /* this code assume that stride % 16 == 0 */
libavcodec/ppc/h264dsp.c
History View file @ 172b0e2
... ... 
@@ -28,7 +28,6 @@
28 28 
 #include "libavutil/intreadwrite.h"
29 29 
 #include "libavutil/mem.h"
30 30 
 #include "libavutil/ppc/cpu.h"
31 
-#include "libavutil/ppc/types_altivec.h"
32 31 
 #include "libavutil/ppc/util_altivec.h"
33 32
34 33 
 #include "libavcodec/h264dec.h"
libavcodec/ppc/h264qpel.c
History View file @ 172b0e2
... ... 
@@ -19,13 +19,15 @@
19 19 
  */
20 20
21 21 
 #include "config.h"
22 
+
22 23 
 #include "libavutil/attributes.h"
23 24 
 #include "libavutil/cpu.h"
24 25 
 #include "libavutil/intreadwrite.h"
25 26 
 #include "libavutil/ppc/cpu.h"
26 
-#include "libavutil/ppc/types_altivec.h"
27 27 
 #include "libavutil/ppc/util_altivec.h"
28 
+
28 29 
 #include "libavcodec/h264qpel.h"
30 
+
29 31 
 #include "hpeldsp_altivec.h"
30 32
31 33 
 #if HAVE_ALTIVEC
libavcodec/ppc/h264qpel_template.c
History View file @ 172b0e2
... ... 
@@ -25,7 +25,6 @@
25 25
26 26 
 #include "libavutil/avassert.h"
27 27 
 #include "libavutil/mem.h"
28 
-#include "libavutil/ppc/types_altivec.h"
29 28 
 #include "libavutil/ppc/util_altivec.h"
30 29
31 30 
 #define ASSERT_ALIGNED(ptr) av_assert2(!((uintptr_t)ptr&0x0000000F));
libavcodec/ppc/hevcdsp.c
History View file @ 172b0e2
... ... 
@@ -20,13 +20,10 @@
20 20 
  */
21 21
22 22 
 #include "config.h"
23 
-#if HAVE_ALTIVEC_H
24 
-#include <altivec.h>
25 
-#endif
26 23
24 
+#include "libavutil/attributes.h"
27 25 
 #include "libavutil/cpu.h"
28 26 
 #include "libavutil/ppc/cpu.h"
29 
-#include "libavutil/ppc/types_altivec.h"
30 27 
 #include "libavutil/ppc/util_altivec.h"
31 28
32 29 
 #include "libavcodec/hevcdsp.h"
libavcodec/ppc/hpeldsp_altivec.c
History View file @ 172b0e2
... ... 
@@ -22,16 +22,13 @@
22 22
23 23 
 #include "config.h"
24 24
25 
-#if HAVE_ALTIVEC_H
26 
-#include <altivec.h>
27 
-#endif
28 
-
29 25 
 #include "libavutil/attributes.h"
30 26 
 #include "libavutil/cpu.h"
31 27 
 #include "libavutil/ppc/cpu.h"
32 
-#include "libavutil/ppc/types_altivec.h"
33 28 
 #include "libavutil/ppc/util_altivec.h"
29 
+
34 30 
 #include "libavcodec/hpeldsp.h"
31 
+
35 32 
 #include "hpeldsp_altivec.h"
36 33
37 34 
 #if HAVE_ALTIVEC
libavcodec/ppc/idctdsp.c
History View file @ 172b0e2
... ... 
@@ -30,17 +30,16 @@
30 30 
  * IDCT function itself was to factor out the partial transposition, and to
31 31 
  * perform a full transpose at the end of the function. */
32 32
33 
+#include "config.h"
34 
+
33 35 
 #include <stdlib.h>
34 36 
 #include <string.h>
35 
-#include "config.h"
36 
-#if HAVE_ALTIVEC_H
37 
-#include <altivec.h>
38 
-#endif
39 37
40 38 
 #include "libavutil/attributes.h"
41 39 
 #include "libavutil/cpu.h"
42 40 
 #include "libavutil/ppc/cpu.h"
43 
-#include "libavutil/ppc/types_altivec.h"
41 
+#include "libavutil/ppc/util_altivec.h"
42 
+
44 43 
 #include "libavcodec/idctdsp.h"
45 44
46 45 
 #if HAVE_ALTIVEC
libavcodec/ppc/lossless_audiodsp_altivec.c
History View file @ 172b0e2
... ... 
@@ -19,14 +19,12 @@
19 19 
  */
20 20
21 21 
 #include "config.h"
22 
-#if HAVE_ALTIVEC_H
23 
-#include <altivec.h>
24 
-#endif
25 22
26 23 
 #include "libavutil/attributes.h"
27 24 
 #include "libavutil/cpu.h"
28 25 
 #include "libavutil/ppc/cpu.h"
29 
-#include "libavutil/ppc/types_altivec.h"
26 
+#include "libavutil/ppc/util_altivec.h"
27 
+
30 28 
 #include "libavcodec/lossless_audiodsp.h"
31 29
32 30 
 #if HAVE_BIGENDIAN
libavcodec/ppc/lossless_videodsp_altivec.c
History View file @ 172b0e2
... ... 
@@ -21,15 +21,12 @@
21 21 
  */
22 22
23 23 
 #include "config.h"
24 
-#if HAVE_ALTIVEC_H
25 
-#include <altivec.h>
26 
-#endif
27 24
28 25 
 #include "libavutil/attributes.h"
29 26 
 #include "libavutil/cpu.h"
30 27 
 #include "libavutil/ppc/cpu.h"
31 
-#include "libavutil/ppc/types_altivec.h"
32 28 
 #include "libavutil/ppc/util_altivec.h"
29 
+
33 30 
 #include "libavcodec/lossless_videodsp.h"
34 31
35 32 
 #if HAVE_ALTIVEC
libavcodec/ppc/me_cmp.c
History View file @ 172b0e2
... ... 
@@ -21,15 +21,12 @@
21 21 
  */
22 22
23 23 
 #include "config.h"
24 
-#if HAVE_ALTIVEC_H
25 
-#include <altivec.h>
26 
-#endif
27 24
28 25 
 #include "libavutil/attributes.h"
29 26 
 #include "libavutil/cpu.h"
30 27 
 #include "libavutil/ppc/cpu.h"
31 
-#include "libavutil/ppc/types_altivec.h"
32 28 
 #include "libavutil/ppc/util_altivec.h"
29 
+
33 30 
 #include "libavcodec/avcodec.h"
34 31 
 #include "libavcodec/mpegvideo.h"
35 32 
 #include "libavcodec/me_cmp.h"
libavcodec/ppc/mpegvideo_altivec.c
History View file @ 172b0e2
... ... 
@@ -25,11 +25,12 @@
25 25 
 #include <stdio.h>
26 26
27 27 
 #include "config.h"
28 
+
28 29 
 #include "libavutil/attributes.h"
29 30 
 #include "libavutil/cpu.h"
30 31 
 #include "libavutil/ppc/cpu.h"
31 
-#include "libavutil/ppc/types_altivec.h"
32 32 
 #include "libavutil/ppc/util_altivec.h"
33 
+
33 34 
 #include "libavcodec/mpegvideo.h"
34 35
35 36 
 #if HAVE_ALTIVEC
libavcodec/ppc/mpegvideodsp.c
History View file @ 172b0e2
... ... 
@@ -23,8 +23,8 @@
23 23 
 #include "libavutil/cpu.h"
24 24 
 #include "libavutil/mem.h"
25 25 
 #include "libavutil/ppc/cpu.h"
26 
-#include "libavutil/ppc/types_altivec.h"
27 26 
 #include "libavutil/ppc/util_altivec.h"
27 
+
28 28 
 #include "libavcodec/mpegvideodsp.h"
29 29
30 30 
 #if HAVE_ALTIVEC
libavcodec/ppc/mpegvideoencdsp.c
History View file @ 172b0e2
... ... 
@@ -17,16 +17,14 @@
17 17 
  */
18 18
19 19 
 #include "config.h"
20 
+
20 21 
 #include <stdint.h>
21 
-#if HAVE_ALTIVEC_H
22 
-#include <altivec.h>
23 
-#endif
24 22
25 23 
 #include "libavutil/attributes.h"
26 24 
 #include "libavutil/cpu.h"
27 25 
 #include "libavutil/ppc/cpu.h"
28 
-#include "libavutil/ppc/types_altivec.h"
29 26 
 #include "libavutil/ppc/util_altivec.h"
27 
+
30 28 
 #include "libavcodec/mpegvideoencdsp.h"
31 29
32 30 
 #if HAVE_ALTIVEC
libavcodec/ppc/pixblockdsp.c
History View file @ 172b0e2
... ... 
@@ -21,15 +21,12 @@
21 21 
  */
22 22
23 23 
 #include "config.h"
24 
-#if HAVE_ALTIVEC_H
25 
-#include <altivec.h>
26 
-#endif
27 24
28 25 
 #include "libavutil/attributes.h"
29 26 
 #include "libavutil/cpu.h"
30 27 
 #include "libavutil/ppc/cpu.h"
31 
-#include "libavutil/ppc/types_altivec.h"
32 28 
 #include "libavutil/ppc/util_altivec.h"
29 
+
33 30 
 #include "libavcodec/avcodec.h"
34 31 
 #include "libavcodec/pixblockdsp.h"
35 32
libavcodec/ppc/svq1enc_altivec.c
History View file @ 172b0e2
... ... 
@@ -18,18 +18,15 @@
18 18 
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
19 19 
  */
20 20
21 
-#include <stdint.h>
22 
-
23 21 
 #include "config.h"
24 
-#if HAVE_ALTIVEC_H
25 
-#include <altivec.h>
26 
-#endif
22 
+
23 
+#include <stdint.h>
27 24
28 25 
 #include "libavutil/attributes.h"
29 26 
 #include "libavutil/cpu.h"
30 27 
 #include "libavutil/ppc/cpu.h"
31 
-#include "libavutil/ppc/types_altivec.h"
32 28 
 #include "libavutil/ppc/util_altivec.h"
29 
+
33 30 
 #include "libavcodec/svq1enc.h"
34 31
35 32 
 #if HAVE_ALTIVEC
libavcodec/ppc/vc1dsp_altivec.c
History View file @ 172b0e2
... ... 
@@ -20,11 +20,12 @@
20 20 
  */
21 21
22 22 
 #include "config.h"
23 
+
23 24 
 #include "libavutil/attributes.h"
24 25 
 #include "libavutil/cpu.h"
25 26 
 #include "libavutil/ppc/cpu.h"
26 
-#include "libavutil/ppc/types_altivec.h"
27 27 
 #include "libavutil/ppc/util_altivec.h"
28 
+
28 29 
 #include "libavcodec/vc1dsp.h"
29 30
30 31 
 #if HAVE_ALTIVEC
libavcodec/ppc/vorbisdsp_altivec.c
History View file @ 172b0e2
... ... 
@@ -19,12 +19,12 @@
19 19 
  */
20 20
21 21 
 #include "config.h"
22 
-#if HAVE_ALTIVEC_H
23 
-#include <altivec.h>
24 
-#endif
22 
+
25 23 
 #include "libavutil/attributes.h"
26 24 
 #include "libavutil/cpu.h"
27 25 
 #include "libavutil/ppc/cpu.h"
26 
+#include "libavutil/ppc/util_altivec.h"
27 
+
28 28 
 #include "libavcodec/vorbisdsp.h"
29 29
30 30 
 #if HAVE_ALTIVEC
libavcodec/ppc/vp3dsp_altivec.c
History View file @ 172b0e2
... ... 
@@ -21,11 +21,12 @@
21 21 
 #include <string.h>
22 22
23 23 
 #include "config.h"
24 
+
24 25 
 #include "libavutil/attributes.h"
25 26 
 #include "libavutil/cpu.h"
26 27 
 #include "libavutil/ppc/cpu.h"
27 
-#include "libavutil/ppc/types_altivec.h"
28 28 
 #include "libavutil/ppc/util_altivec.h"
29 
+
29 30 
 #include "libavcodec/vp3dsp.h"
30 31
31 32 
 #if HAVE_ALTIVEC
libavcodec/ppc/vp8dsp_altivec.c
History View file @ 172b0e2
... ... 
@@ -21,12 +21,14 @@
21 21 
  */
22 22
23 23 
 #include "config.h"
24 
+
24 25 
 #include "libavutil/cpu.h"
25 26 
 #include "libavutil/mem.h"
26 27 
 #include "libavutil/ppc/cpu.h"
27 
-#include "libavutil/ppc/types_altivec.h"
28 28 
 #include "libavutil/ppc/util_altivec.h"
29 
+
29 30 
 #include "libavcodec/vp8dsp.h"
31 
+
30 32 
 #include "hpeldsp_altivec.h"
31 33
32 34 
 #if HAVE_ALTIVEC
libpostproc/postprocess.c
History View file @ 172b0e2
... ... 
@@ -89,6 +89,7 @@ try to unroll inner for(x=0 ... loop to avoid these damn if(x ... checks
89 89 
 #include "postprocess.h"
90 90 
 #include "postprocess_internal.h"
91 91 
 #include "libavutil/avstring.h"
92 
+#include "libavutil/ppc/util_altivec.h"
92 93
93 94 
 #include "libavutil/ffversion.h"
94 95 
 const char postproc_ffversion[] = "FFmpeg version " FFMPEG_VERSION;
... ... 
@@ -110,10 +111,6 @@ const char *postproc_license(void)
110 110 
     return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;
111 111 
 }
112 112
113 
-#if HAVE_ALTIVEC_H
114 
-#include <altivec.h>
115 
-#endif
116 
-
117 113 
 #define GET_MODE_BUFFER_SIZE 500
118 114 
 #define OPTIONS_ARRAY_SIZE 10
119 115 
 #define BLOCK_SIZE 8
libswscale/swscale_internal.h
History View file @ 172b0e2
... ... 
@@ -22,11 +22,6 @@
22 22 
 #define SWSCALE_SWSCALE_INTERNAL_H
23 23
24 24 
 #include "config.h"
25 
-
26 
-#if HAVE_ALTIVEC_H
27 
-#include <altivec.h>
28 
-#endif
29 
-
30 25 
 #include "version.h"
31 26
32 27 
 #include "libavutil/avassert.h"
... ... 
@@ -36,6 +31,7 @@
36 36 
 #include "libavutil/log.h"
37 37 
 #include "libavutil/pixfmt.h"
38 38 
 #include "libavutil/pixdesc.h"
39 
+#include "libavutil/ppc/util_altivec.h"
39 40
40 41 
 #define STR(s) AV_TOSTRING(s) // AV_STRINGIFY is too long
41 42