falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

ppc: Centralize compiler-specific altivec.h #include handling in one place 

Also move #includes into canonical order where appropriate.
tags/n3.4
Diego Biurrun 9 years ago
parent
39929e55eb
commit
ea7ee4b4e3
23 changed files with 45 additions and 67 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +2
    -4
      libavcodec/ppc/apedsp_altivec.c
  2. +1
    -4
      libavcodec/ppc/audiodsp.c
  3. +3
    -4
      libavcodec/ppc/blockdsp.c
  4. +3
    -3
      libavcodec/ppc/fdctdsp.c
  5. +2
    -1
      libavcodec/ppc/h264chroma_init.c
  6. +0
    -1
      libavcodec/ppc/h264dsp.c
  7. +3
    -1
      libavcodec/ppc/h264qpel.c
  8. +1
    -4
      libavcodec/ppc/hevcdsp.c
  9. +2
    -5
      libavcodec/ppc/hpeldsp_altivec.c
  10. +1
    -4
      libavcodec/ppc/huffyuvdsp_altivec.c
  11. +4
    -5
      libavcodec/ppc/idctdsp.c
  12. +2
    -1
      libavcodec/ppc/mdct_init.c
  13. +1
    -4
      libavcodec/ppc/me_cmp.c
  14. +2
    -1
      libavcodec/ppc/mpegvideo_altivec.c
  15. +1
    -1
      libavcodec/ppc/mpegvideodsp.c
  16. +2
    -4
      libavcodec/ppc/mpegvideoencdsp.c
  17. +1
    -4
      libavcodec/ppc/pixblockdsp.c
  18. +3
    -6
      libavcodec/ppc/svq1enc_altivec.c
  19. +2
    -1
      libavcodec/ppc/vc1dsp_altivec.c
  20. +3
    -3
      libavcodec/ppc/vorbisdsp_altivec.c
  21. +2
    -1
      libavcodec/ppc/vp3dsp_altivec.c
  22. +3
    -1
      libavcodec/ppc/vp8dsp_altivec.c
  23. +1
    -4
      libswscale/swscale_internal.h

+ 2
- 4
libavcodec/ppc/apedsp_altivec.c 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/apedsp.h"

#if HAVE_ALTIVEC && HAVE_BIGENDIAN


+ 1
- 4
libavcodec/ppc/audiodsp.c 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 && HAVE_BIGENDIAN


+ 3
- 4
libavcodec/ppc/blockdsp.c 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 ***** */


+ 3
- 3
libavcodec/ppc/fdctdsp.c 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 && HAVE_BIGENDIAN


+ 2
- 1
libavcodec/ppc/h264chroma_init.c 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 && HAVE_BIGENDIAN


+ 0
- 1
libavcodec/ppc/h264dsp.c 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"


+ 3
- 1
libavcodec/ppc/h264qpel.c 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 && HAVE_BIGENDIAN


+ 1
- 4
libavcodec/ppc/hevcdsp.c View File

@@ -19,13 +19,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"


+ 2
- 5
libavcodec/ppc/hpeldsp_altivec.c 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 && HAVE_BIGENDIAN


+ 1
- 4
libavcodec/ppc/huffyuvdsp_altivec.c 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/huffyuvdsp.h"

#if HAVE_ALTIVEC


+ 4
- 5
libavcodec/ppc/idctdsp.c 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 && HAVE_BIGENDIAN


+ 2
- 1
libavcodec/ppc/mdct_init.c View File

@@ -21,10 +21,11 @@
*/

#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
- 4
libavcodec/ppc/me_cmp.c 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"


+ 2
- 1
libavcodec/ppc/mpegvideo_altivec.c 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 && HAVE_BIGENDIAN


+ 1
- 1
libavcodec/ppc/mpegvideodsp.c 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 && HAVE_BIGENDIAN


+ 2
- 4
libavcodec/ppc/mpegvideoencdsp.c 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 && HAVE_BIGENDIAN


+ 1
- 4
libavcodec/ppc/pixblockdsp.c 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"



+ 3
- 6
libavcodec/ppc/svq1enc_altivec.c 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 && HAVE_BIGENDIAN


+ 2
- 1
libavcodec/ppc/vc1dsp_altivec.c 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 && HAVE_BIGENDIAN


+ 3
- 3
libavcodec/ppc/vorbisdsp_altivec.c 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 && HAVE_BIGENDIAN


+ 2
- 1
libavcodec/ppc/vp3dsp_altivec.c 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 && HAVE_BIGENDIAN


+ 3
- 1
libavcodec/ppc/vp8dsp_altivec.c 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 && HAVE_BIGENDIAN


+ 1
- 4
libswscale/swscale_internal.h View File

@@ -23,16 +23,13 @@

#include "config.h"

#if HAVE_ALTIVEC_H
#include <altivec.h>
#endif

#include "libavutil/avassert.h"
#include "libavutil/avutil.h"
#include "libavutil/common.h"
#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