diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-26 13:05:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-26 13:05:10 +0100 |
| commit | a984efd104cc3f4ab7f7209fa1b1bab6a44720db (patch) | |
| tree | a0d9d5e407432f97249232898b45585fee399fa1 /libavcodec/ppc | |
| parent | 9b1a0c2ee82f3b99584857db1ea662e2d08aca7f (diff) | |
| parent | c242bbd8b6939507a1a6fb64101b0553d92d303f (diff) | |
| download | ffmpeg-a984efd104cc3f4ab7f7209fa1b1bab6a44720db.tar.gz | |
Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f'
* commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f':
Remove unnecessary dsputil.h #includes
Conflicts:
libavcodec/ffv1.c
libavcodec/h261dec.c
libavcodec/h261enc.c
libavcodec/h264pred.c
libavcodec/lpc.h
libavcodec/mjpegdec.c
libavcodec/rectangle.h
libavcodec/x86/idct_sse2_xvid.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ppc')
| -rw-r--r-- | libavcodec/ppc/dsputil_ppc.c | 1 | ||||
| -rw-r--r-- | libavcodec/ppc/fdct_altivec.c | 1 | ||||
| -rw-r--r-- | libavcodec/ppc/gmc_altivec.c | 1 | ||||
| -rw-r--r-- | libavcodec/ppc/idct_altivec.c | 1 | ||||
| -rw-r--r-- | libavcodec/ppc/mpegvideo_altivec.c | 1 | ||||
| -rw-r--r-- | libavcodec/ppc/vc1dsp_altivec.c | 1 | ||||
| -rw-r--r-- | libavcodec/ppc/vp3dsp_altivec.c | 1 |
7 files changed, 0 insertions, 7 deletions
diff --git a/libavcodec/ppc/dsputil_ppc.c b/libavcodec/ppc/dsputil_ppc.c index 6fce90438b..4b2bd60858 100644 --- a/libavcodec/ppc/dsputil_ppc.c +++ b/libavcodec/ppc/dsputil_ppc.c @@ -25,7 +25,6 @@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/mem.h" -#include "libavcodec/dsputil.h" #include "dsputil_altivec.h" /* ***** WARNING ***** WARNING ***** WARNING ***** */ diff --git a/libavcodec/ppc/fdct_altivec.c b/libavcodec/ppc/fdct_altivec.c index 608dac4295..acab127314 100644 --- a/libavcodec/ppc/fdct_altivec.c +++ b/libavcodec/ppc/fdct_altivec.c @@ -23,7 +23,6 @@ #include <altivec.h> #endif #include "libavutil/common.h" -#include "libavcodec/dsputil.h" #include "dsputil_altivec.h" #define vs16(v) ((vector signed short)(v)) diff --git a/libavcodec/ppc/gmc_altivec.c b/libavcodec/ppc/gmc_altivec.c index 4e361214d0..4db761de44 100644 --- a/libavcodec/ppc/gmc_altivec.c +++ b/libavcodec/ppc/gmc_altivec.c @@ -23,7 +23,6 @@ #include "libavutil/mem.h" #include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/util_altivec.h" -#include "libavcodec/dsputil.h" #include "dsputil_altivec.h" /* diff --git a/libavcodec/ppc/idct_altivec.c b/libavcodec/ppc/idct_altivec.c index 9a8b91740e..c6f2cd8b8a 100644 --- a/libavcodec/ppc/idct_altivec.c +++ b/libavcodec/ppc/idct_altivec.c @@ -42,7 +42,6 @@ #include <altivec.h> #endif #include "libavutil/ppc/types_altivec.h" -#include "libavcodec/dsputil.h" #include "dsputil_altivec.h" #define IDCT_HALF \ diff --git a/libavcodec/ppc/mpegvideo_altivec.c b/libavcodec/ppc/mpegvideo_altivec.c index 249f565af5..bf490b04ea 100644 --- a/libavcodec/ppc/mpegvideo_altivec.c +++ b/libavcodec/ppc/mpegvideo_altivec.c @@ -28,7 +28,6 @@ #include "libavutil/cpu.h" #include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/util_altivec.h" -#include "libavcodec/dsputil.h" #include "libavcodec/mpegvideo.h" #include "dsputil_altivec.h" diff --git a/libavcodec/ppc/vc1dsp_altivec.c b/libavcodec/ppc/vc1dsp_altivec.c index 1a0d7c08dd..9c2ad70b62 100644 --- a/libavcodec/ppc/vc1dsp_altivec.c +++ b/libavcodec/ppc/vc1dsp_altivec.c @@ -22,7 +22,6 @@ #include "libavutil/attributes.h" #include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/util_altivec.h" -#include "libavcodec/dsputil.h" #include "libavcodec/vc1dsp.h" // main steps of 8x8 transform diff --git a/libavcodec/ppc/vp3dsp_altivec.c b/libavcodec/ppc/vp3dsp_altivec.c index 54e291e483..42ae00b8ba 100644 --- a/libavcodec/ppc/vp3dsp_altivec.c +++ b/libavcodec/ppc/vp3dsp_altivec.c @@ -29,7 +29,6 @@ #include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/util_altivec.h" -#include "libavcodec/dsputil.h" #include "dsputil_altivec.h" static const vec_s16 constants = |