From a053dbfcfb3aca091773c38e82bdd0863216fc7b Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Sat, 27 Apr 2013 00:37:32 +0200
Subject: [PATCH 1/2] ppc: Move AltiVec utility headers out of AltiVec ifdefs

Now that the headers themselves have ifdef protection this is no
longer necessary and more consistent with normal include handling.
---
 libavcodec/ppc/h264chroma_init.c | 5 ++---
 libavcodec/ppc/h264qpel.c        | 6 +++---
 libavcodec/ppc/hpeldsp_altivec.c | 9 +++++----
 libavcodec/ppc/vp3dsp_altivec.c  | 7 +++----
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/libavcodec/ppc/h264chroma_init.c b/libavcodec/ppc/h264chroma_init.c
index 06456ec6e6..f36d8e94bd 100644
--- a/libavcodec/ppc/h264chroma_init.c
+++ b/libavcodec/ppc/h264chroma_init.c
@@ -20,15 +20,14 @@
 
 #include "config.h"
 #include "libavutil/attributes.h"
-#include "libavcodec/h264chroma.h"
-
-#if HAVE_ALTIVEC
 #include "libavutil/cpu.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/ppc/types_altivec.h"
 #include "libavutil/ppc/util_altivec.h"
+#include "libavcodec/h264chroma.h"
 #include "dsputil_altivec.h"
 
+#if HAVE_ALTIVEC
 #define PUT_OP_U8_ALTIVEC(d, s, dst) d = s
 #define AVG_OP_U8_ALTIVEC(d, s, dst) d = vec_avg(dst, s)
 
diff --git a/libavcodec/ppc/h264qpel.c b/libavcodec/ppc/h264qpel.c
index 7700294bb3..113617c98f 100644
--- a/libavcodec/ppc/h264qpel.c
+++ b/libavcodec/ppc/h264qpel.c
@@ -20,15 +20,15 @@
 
 #include "config.h"
 #include "libavutil/attributes.h"
-#include "libavcodec/h264qpel.h"
-
-#if HAVE_ALTIVEC
 #include "libavutil/cpu.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/ppc/types_altivec.h"
 #include "libavutil/ppc/util_altivec.h"
+#include "libavcodec/h264qpel.h"
 #include "dsputil_altivec.h"
 
+#if HAVE_ALTIVEC
+
 #define PUT_OP_U8_ALTIVEC(d, s, dst) d = s
 #define AVG_OP_U8_ALTIVEC(d, s, dst) d = vec_avg(dst, s)
 
diff --git a/libavcodec/ppc/hpeldsp_altivec.c b/libavcodec/ppc/hpeldsp_altivec.c
index 868ca95d89..69c2777d70 100644
--- a/libavcodec/ppc/hpeldsp_altivec.c
+++ b/libavcodec/ppc/hpeldsp_altivec.c
@@ -21,18 +21,19 @@
  */
 
 #include "config.h"
-#include "libavutil/attributes.h"
-#include "libavutil/cpu.h"
-#include "libavcodec/hpeldsp.h"
 
-#if HAVE_ALTIVEC
 #if HAVE_ALTIVEC_H
 #include <altivec.h>
 #endif
+
+#include "libavutil/attributes.h"
+#include "libavutil/cpu.h"
 #include "libavutil/ppc/types_altivec.h"
 #include "libavutil/ppc/util_altivec.h"
+#include "libavcodec/hpeldsp.h"
 #include "dsputil_altivec.h"
 
+#if HAVE_ALTIVEC
 /* 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)
 {
diff --git a/libavcodec/ppc/vp3dsp_altivec.c b/libavcodec/ppc/vp3dsp_altivec.c
index c512047b82..48436f3337 100644
--- a/libavcodec/ppc/vp3dsp_altivec.c
+++ b/libavcodec/ppc/vp3dsp_altivec.c
@@ -23,14 +23,13 @@
 #include "config.h"
 #include "libavutil/attributes.h"
 #include "libavutil/cpu.h"
-#include "libavcodec/vp3dsp.h"
-
-#if HAVE_ALTIVEC
-
 #include "libavutil/ppc/types_altivec.h"
 #include "libavutil/ppc/util_altivec.h"
+#include "libavcodec/vp3dsp.h"
 #include "dsputil_altivec.h"
 
+#if HAVE_ALTIVEC
+
 static const vec_s16 constants =
     {0, 64277, 60547, 54491, 46341, 36410, 25080, 12785};
 static const vec_u8 interleave_high =

From 42b9150b0d4f0a130c1d93dc991fd5412743a8cf Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Fri, 26 Apr 2013 12:43:11 +0200
Subject: [PATCH 2/2] fft: Remove pointless #ifdefs around function
 declarations

---
 libavcodec/fft.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/libavcodec/fft.h b/libavcodec/fft.h
index 7f10f72a3a..dc05d7736e 100644
--- a/libavcodec/fft.h
+++ b/libavcodec/fft.h
@@ -133,13 +133,11 @@ void ff_init_ff_cos_tabs(int index);
  */
 int ff_fft_init(FFTContext *s, int nbits, int inverse);
 
-#if CONFIG_FFT_FLOAT
 void ff_fft_init_altivec(FFTContext *s);
 void ff_fft_init_x86(FFTContext *s);
 void ff_fft_init_arm(FFTContext *s);
-#else
+
 void ff_fft_fixed_init_arm(FFTContext *s);
-#endif
 
 void ff_fft_end(FFTContext *s);