Merge commit '49676eb7'

* commit '49676eb7':
  dsputil: Remove prototypes for nonexisting optimization functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/arm/dsputil_arm.h

@@ -26,7 +26,6 @@
 
 void ff_dsputil_init_armv5te(DSPContext* c, AVCodecContext *avctx);
 void ff_dsputil_init_armv6(DSPContext* c, AVCodecContext *avctx);
-void ff_dsputil_init_vfp(DSPContext* c, AVCodecContext *avctx);
 void ff_dsputil_init_neon(DSPContext *c, AVCodecContext *avctx);
 
 #endif /* AVCODEC_ARM_DSPUTIL_ARM_H */

libavcodec/ppc/dsputil_altivec.h

@@ -37,7 +37,6 @@ void ff_idct_put_altivec(uint8_t *dest, int line_size, int16_t *block);
 void ff_idct_add_altivec(uint8_t *dest, int line_size, int16_t *block);
 
 void ff_dsputil_init_altivec(DSPContext* c, AVCodecContext *avctx);
-void ff_float_init_altivec(DSPContext* c, AVCodecContext *avctx);
 void ff_int_init_altivec(DSPContext* c, AVCodecContext *avctx);
 
 #endif /* AVCODEC_PPC_DSPUTIL_ALTIVEC_H */