Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'ea7ee4b4e381e0fa731458de0cbf740430eeb013'

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

Merged-by: Clément Bœsch <u@pkh.me>
pull/254/merge
Clément Bœsch 8 years ago
parent 3a033bc5cf ea7ee4b4e3
commit 172b0e2e88
28 changed files with 44 additions and 76 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      libavcodec/ppc/audiodsp.c
  2. 7
      libavcodec/ppc/blockdsp.c
  3. 6
      libavcodec/ppc/fdctdsp.c
  4. 1
      libavcodec/ppc/fft_init.c
  5. 1
      libavcodec/ppc/fft_vsx.c
  6. 1
      libavcodec/ppc/fft_vsx.h
  7. 3
      libavcodec/ppc/h264chroma_init.c
  8. 1
      libavcodec/ppc/h264chroma_template.c
  9. 1
      libavcodec/ppc/h264dsp.c
  10. 4
      libavcodec/ppc/h264qpel.c
  11. 1
      libavcodec/ppc/h264qpel_template.c
  12. 5
      libavcodec/ppc/hevcdsp.c
  13. 7
      libavcodec/ppc/hpeldsp_altivec.c
  14. 9
      libavcodec/ppc/idctdsp.c
  15. 6
      libavcodec/ppc/lossless_audiodsp_altivec.c
  16. 5
      libavcodec/ppc/lossless_videodsp_altivec.c
  17. 5
      libavcodec/ppc/me_cmp.c
  18. 3
      libavcodec/ppc/mpegvideo_altivec.c
  19. 2
      libavcodec/ppc/mpegvideodsp.c
  20. 6
      libavcodec/ppc/mpegvideoencdsp.c
  21. 5
      libavcodec/ppc/pixblockdsp.c
  22. 9
      libavcodec/ppc/svq1enc_altivec.c
  23. 3
      libavcodec/ppc/vc1dsp_altivec.c
  24. 6
      libavcodec/ppc/vorbisdsp_altivec.c
  25. 3
      libavcodec/ppc/vp3dsp_altivec.c
  26. 4
      libavcodec/ppc/vp8dsp_altivec.c
  27. 5
      libpostproc/postprocess.c
  28. 6
      libswscale/swscale_internal.h

5
libavcodec/ppc/audiodsp.c
Unescape View File

@ -24,15 +24,12 @@
*/
#include "config.h"
#if HAVE_ALTIVEC_H
#include <altivec.h>
#endif
#include "libavutil/attributes.h"
#include "libavutil/cpu.h"
#include "libavutil/ppc/cpu.h"
#include "libavutil/ppc/types_altivec.h"
#include "libavutil/ppc/util_altivec.h"
#include "libavcodec/audiodsp.h"
#if HAVE_ALTIVEC

7
libavcodec/ppc/blockdsp.c
Unescape View File

@ -21,16 +21,15 @@
*/
#include "config.h"
#if HAVE_ALTIVEC_H
#include <altivec.h>
#endif
#include <string.h>
#include "libavutil/attributes.h"
#include "libavutil/cpu.h"
#include "libavutil/mem.h"
#include "libavutil/ppc/cpu.h"
#include "libavutil/ppc/types_altivec.h"
#include "libavutil/ppc/util_altivec.h"
#include "libavcodec/blockdsp.h"
/* ***** WARNING ***** WARNING ***** WARNING ***** */

6
libavcodec/ppc/fdctdsp.c
Unescape View File

@ -19,14 +19,14 @@
*/
#include "config.h"
#if HAVE_ALTIVEC_H
#include <altivec.h>
#endif
#include "libavutil/attributes.h"
#include "libavutil/cpu.h"
#include "libavutil/ppc/cpu.h"
#include "libavutil/ppc/util_altivec.h"
#include "libavcodec/fdctdsp.h"
#include "fdct.h"
#if HAVE_ALTIVEC

1
libavcodec/ppc/fft_init.c
Unescape View File

@ -23,7 +23,6 @@
#include "config.h"
#include "libavutil/cpu.h"
#include "libavutil/ppc/cpu.h"
#include "libavutil/ppc/types_altivec.h"
#include "libavutil/ppc/util_altivec.h"
#include "libavcodec/fft.h"

1
libavcodec/ppc/fft_vsx.c
Unescape View File

@ -25,7 +25,6 @@
#include "config.h"
#include "libavutil/cpu.h"
#include "libavutil/ppc/types_altivec.h"
#include "libavutil/ppc/util_altivec.h"
#include "libavcodec/fft.h"
#include "libavcodec/fft-internal.h"

1
libavcodec/ppc/fft_vsx.h
Unescape View File

@ -27,7 +27,6 @@
#include "config.h"
#include "libavutil/cpu.h"
#include "libavutil/ppc/types_altivec.h"
#include "libavutil/ppc/util_altivec.h"
#include "libavcodec/fft.h"
#include "libavcodec/fft-internal.h"

3
libavcodec/ppc/h264chroma_init.c
Unescape View File

@ -19,12 +19,13 @@
*/
#include "config.h"
#include "libavutil/attributes.h"
#include "libavutil/cpu.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/ppc/cpu.h"
#include "libavutil/ppc/types_altivec.h"
#include "libavutil/ppc/util_altivec.h"
#include "libavcodec/h264chroma.h"
#if HAVE_ALTIVEC

1
libavcodec/ppc/h264chroma_template.c
Unescape View File

@ -19,7 +19,6 @@
*/
#include "libavutil/mem.h"
#include "libavutil/ppc/types_altivec.h"
#include "libavutil/ppc/util_altivec.h"
/* this code assume that stride % 16 == 0 */

1
libavcodec/ppc/h264dsp.c
Unescape View File

@ -28,7 +28,6 @@
#include "libavutil/intreadwrite.h"
#include "libavutil/mem.h"
#include "libavutil/ppc/cpu.h"
#include "libavutil/ppc/types_altivec.h"
#include "libavutil/ppc/util_altivec.h"
#include "libavcodec/h264dec.h"

4
libavcodec/ppc/h264qpel.c
Unescape View File

@ -19,13 +19,15 @@
*/
#include "config.h"
#include "libavutil/attributes.h"
#include "libavutil/cpu.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/ppc/cpu.h"
#include "libavutil/ppc/types_altivec.h"
#include "libavutil/ppc/util_altivec.h"
#include "libavcodec/h264qpel.h"
#include "hpeldsp_altivec.h"
#if HAVE_ALTIVEC

1
libavcodec/ppc/h264qpel_template.c
Unescape View File

@ -25,7 +25,6 @@
#include "libavutil/avassert.h"
#include "libavutil/mem.h"
#include "libavutil/ppc/types_altivec.h"
#include "libavutil/ppc/util_altivec.h"
#define ASSERT_ALIGNED(ptr) av_assert2(!((uintptr_t)ptr&0x0000000F));

5
libavcodec/ppc/hevcdsp.c
Unescape View File

@ -20,13 +20,10 @@
*/
#include "config.h"
#if HAVE_ALTIVEC_H
#include <altivec.h>
#endif
#include "libavutil/attributes.h"
#include "libavutil/cpu.h"
#include "libavutil/ppc/cpu.h"
#include "libavutil/ppc/types_altivec.h"
#include "libavutil/ppc/util_altivec.h"
#include "libavcodec/hevcdsp.h"

7
libavcodec/ppc/hpeldsp_altivec.c
Unescape View File

@ -22,16 +22,13 @@
#include "config.h"
#if HAVE_ALTIVEC_H
#include <altivec.h>
#endif
#include "libavutil/attributes.h"
#include "libavutil/cpu.h"
#include "libavutil/ppc/cpu.h"
#include "libavutil/ppc/types_altivec.h"
#include "libavutil/ppc/util_altivec.h"
#include "libavcodec/hpeldsp.h"
#include "hpeldsp_altivec.h"
#if HAVE_ALTIVEC

9
libavcodec/ppc/idctdsp.c
Unescape View File

@ -30,17 +30,16 @@
* IDCT function itself was to factor out the partial transposition, and to
* perform a full transpose at the end of the function. */
#include "config.h"
#include <stdlib.h>
#include <string.h>
#include "config.h"
#if HAVE_ALTIVEC_H
#include <altivec.h>
#endif
#include "libavutil/attributes.h"
#include "libavutil/cpu.h"
#include "libavutil/ppc/cpu.h"
#include "libavutil/ppc/types_altivec.h"
#include "libavutil/ppc/util_altivec.h"
#include "libavcodec/idctdsp.h"
#if HAVE_ALTIVEC

6
libavcodec/ppc/lossless_audiodsp_altivec.c
Unescape View File

@ -19,14 +19,12 @@
*/
#include "config.h"
#if HAVE_ALTIVEC_H
#include <altivec.h>
#endif
#include "libavutil/attributes.h"
#include "libavutil/cpu.h"
#include "libavutil/ppc/cpu.h"
#include "libavutil/ppc/types_altivec.h"
#include "libavutil/ppc/util_altivec.h"
#include "libavcodec/lossless_audiodsp.h"
#if HAVE_BIGENDIAN

5
libavcodec/ppc/lossless_videodsp_altivec.c
Unescape View File

@ -21,15 +21,12 @@
*/
#include "config.h"
#if HAVE_ALTIVEC_H
#include <altivec.h>
#endif
#include "libavutil/attributes.h"
#include "libavutil/cpu.h"
#include "libavutil/ppc/cpu.h"
#include "libavutil/ppc/types_altivec.h"
#include "libavutil/ppc/util_altivec.h"
#include "libavcodec/lossless_videodsp.h"
#if HAVE_ALTIVEC

5
libavcodec/ppc/me_cmp.c
Unescape View File

@ -21,15 +21,12 @@
*/
#include "config.h"
#if HAVE_ALTIVEC_H
#include <altivec.h>
#endif
#include "libavutil/attributes.h"
#include "libavutil/cpu.h"
#include "libavutil/ppc/cpu.h"
#include "libavutil/ppc/types_altivec.h"
#include "libavutil/ppc/util_altivec.h"
#include "libavcodec/avcodec.h"
#include "libavcodec/mpegvideo.h"
#include "libavcodec/me_cmp.h"

3
libavcodec/ppc/mpegvideo_altivec.c
Unescape View File

@ -25,11 +25,12 @@
#include <stdio.h>
#include "config.h"
#include "libavutil/attributes.h"
#include "libavutil/cpu.h"
#include "libavutil/ppc/cpu.h"
#include "libavutil/ppc/types_altivec.h"
#include "libavutil/ppc/util_altivec.h"
#include "libavcodec/mpegvideo.h"
#if HAVE_ALTIVEC

2
libavcodec/ppc/mpegvideodsp.c
Unescape View File

@ -23,8 +23,8 @@
#include "libavutil/cpu.h"
#include "libavutil/mem.h"
#include "libavutil/ppc/cpu.h"
#include "libavutil/ppc/types_altivec.h"
#include "libavutil/ppc/util_altivec.h"
#include "libavcodec/mpegvideodsp.h"
#if HAVE_ALTIVEC

6
libavcodec/ppc/mpegvideoencdsp.c
Unescape View File

@ -17,16 +17,14 @@
*/
#include "config.h"
#include <stdint.h>
#if HAVE_ALTIVEC_H
#include <altivec.h>
#endif
#include "libavutil/attributes.h"
#include "libavutil/cpu.h"
#include "libavutil/ppc/cpu.h"
#include "libavutil/ppc/types_altivec.h"
#include "libavutil/ppc/util_altivec.h"
#include "libavcodec/mpegvideoencdsp.h"
#if HAVE_ALTIVEC

5
libavcodec/ppc/pixblockdsp.c
Unescape View File

@ -21,15 +21,12 @@
*/
#include "config.h"
#if HAVE_ALTIVEC_H
#include <altivec.h>
#endif
#include "libavutil/attributes.h"
#include "libavutil/cpu.h"
#include "libavutil/ppc/cpu.h"
#include "libavutil/ppc/types_altivec.h"
#include "libavutil/ppc/util_altivec.h"
#include "libavcodec/avcodec.h"
#include "libavcodec/pixblockdsp.h"

9
libavcodec/ppc/svq1enc_altivec.c
Unescape View File

@ -18,18 +18,15 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <stdint.h>
#include "config.h"
#if HAVE_ALTIVEC_H
#include <altivec.h>
#endif
#include <stdint.h>
#include "libavutil/attributes.h"
#include "libavutil/cpu.h"
#include "libavutil/ppc/cpu.h"
#include "libavutil/ppc/types_altivec.h"
#include "libavutil/ppc/util_altivec.h"
#include "libavcodec/svq1enc.h"
#if HAVE_ALTIVEC

3
libavcodec/ppc/vc1dsp_altivec.c
Unescape View File

@ -20,11 +20,12 @@
*/
#include "config.h"
#include "libavutil/attributes.h"
#include "libavutil/cpu.h"
#include "libavutil/ppc/cpu.h"
#include "libavutil/ppc/types_altivec.h"
#include "libavutil/ppc/util_altivec.h"
#include "libavcodec/vc1dsp.h"
#if HAVE_ALTIVEC

6
libavcodec/ppc/vorbisdsp_altivec.c
Unescape View File

@ -19,12 +19,12 @@
*/
#include "config.h"
#if HAVE_ALTIVEC_H
#include <altivec.h>
#endif
#include "libavutil/attributes.h"
#include "libavutil/cpu.h"
#include "libavutil/ppc/cpu.h"
#include "libavutil/ppc/util_altivec.h"
#include "libavcodec/vorbisdsp.h"
#if HAVE_ALTIVEC

3
libavcodec/ppc/vp3dsp_altivec.c
Unescape View File

@ -21,11 +21,12 @@
#include <string.h>
#include "config.h"
#include "libavutil/attributes.h"
#include "libavutil/cpu.h"
#include "libavutil/ppc/cpu.h"
#include "libavutil/ppc/types_altivec.h"
#include "libavutil/ppc/util_altivec.h"
#include "libavcodec/vp3dsp.h"
#if HAVE_ALTIVEC

4
libavcodec/ppc/vp8dsp_altivec.c
Unescape View File

@ -21,12 +21,14 @@
*/
#include "config.h"
#include "libavutil/cpu.h"
#include "libavutil/mem.h"
#include "libavutil/ppc/cpu.h"
#include "libavutil/ppc/types_altivec.h"
#include "libavutil/ppc/util_altivec.h"
#include "libavcodec/vp8dsp.h"
#include "hpeldsp_altivec.h"
#if HAVE_ALTIVEC

5
libpostproc/postprocess.c
Unescape View File

@ -89,6 +89,7 @@ try to unroll inner for(x=0 ... loop to avoid these damn if(x ... checks
#include "postprocess.h"
#include "postprocess_internal.h"
#include "libavutil/avstring.h"
#include "libavutil/ppc/util_altivec.h"
#include "libavutil/ffversion.h"
const char postproc_ffversion[] = "FFmpeg version " FFMPEG_VERSION;
@ -110,10 +111,6 @@ const char *postproc_license(void)
return LICENSE_PREFIX FFMPEG_LICENSE + sizeof(LICENSE_PREFIX) - 1;
}
#if HAVE_ALTIVEC_H
#include <altivec.h>
#endif
#define GET_MODE_BUFFER_SIZE 500
#define OPTIONS_ARRAY_SIZE 10
#define BLOCK_SIZE 8

6
libswscale/swscale_internal.h
Unescape View File

@ -22,11 +22,6 @@
#define SWSCALE_SWSCALE_INTERNAL_H
#include "config.h"
#if HAVE_ALTIVEC_H
#include <altivec.h>
#endif
#include "version.h"
#include "libavutil/avassert.h"
@ -36,6 +31,7 @@
#include "libavutil/log.h"
#include "libavutil/pixfmt.h"
#include "libavutil/pixdesc.h"
#include "libavutil/ppc/util_altivec.h"
#define STR(s) AV_TOSTRING(s) // AV_STRINGIFY is too long

Write Preview
Loading…
Cancel
Save