Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Jun 2012 21:02:54 +0000 (23:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Jun 2012 21:59:09 +0000 (23:59 +0200)
commit7e22514d98ecd56cc4e55dac7c813551e2152b80
tree13c47e1e1215525323177a008d5406a7d61a418a
parente016e3c9d7ce1493b952bdd8232f7e03077469a3
parent3b81a18ba30bf18bab78f56744d8f3e1e4060104
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  float_dsp: ppc: add a separate header for Altivec function prototypes
  ARM: fix float_dsp breakage from d5a7229
  Add a float DSP framework to libavutil
  PPC: Move types_altivec.h and util_altivec.h from libavcodec to libavutil
  ARM: Move asm.S from libavcodec to libavutil
  vc1dsp: mark put/avg_vc1_mspel_mc() always_inline

Merged-by: Michael Niedermayer <michaelni@gmx.at>
73 files changed:
libavcodec/aac.h
libavcodec/aacdec.c
libavcodec/aacenc.c
libavcodec/aacenc.h
libavcodec/ac3enc.c
libavcodec/ac3enc_fixed.c
libavcodec/ac3enc_float.c
libavcodec/ac3enc_template.c
libavcodec/arm/ac3dsp_neon.S
libavcodec/arm/dcadsp_neon.S
libavcodec/arm/dsputil_arm.S
libavcodec/arm/dsputil_armv6.S
libavcodec/arm/dsputil_init_neon.c
libavcodec/arm/dsputil_init_vfp.c
libavcodec/arm/dsputil_neon.S
libavcodec/arm/dsputil_vfp.S
libavcodec/arm/fft_fixed_neon.S
libavcodec/arm/fft_neon.S
libavcodec/arm/fmtconvert_neon.S
libavcodec/arm/fmtconvert_vfp.S
libavcodec/arm/h264dsp_neon.S
libavcodec/arm/h264idct_neon.S
libavcodec/arm/h264pred_neon.S
libavcodec/arm/int_neon.S
libavcodec/arm/mdct_neon.S
libavcodec/arm/mpegvideo_armv5te_s.S
libavcodec/arm/mpegvideo_neon.S
libavcodec/arm/rdft_neon.S
libavcodec/arm/simple_idct_arm.S
libavcodec/arm/simple_idct_armv5te.S
libavcodec/arm/simple_idct_armv6.S
libavcodec/arm/simple_idct_neon.S
libavcodec/arm/synth_filter_neon.S
libavcodec/arm/vp3dsp_neon.S
libavcodec/arm/vp56dsp_neon.S
libavcodec/arm/vp8_armv6.S
libavcodec/arm/vp8dsp_neon.S
libavcodec/atrac3.c
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/nellymoserenc.c
libavcodec/ppc/dsputil_altivec.c
libavcodec/ppc/fft_altivec.c
libavcodec/ppc/float_altivec.c
libavcodec/ppc/fmtconvert_altivec.c
libavcodec/ppc/gmc_altivec.c
libavcodec/ppc/h264_altivec.c
libavcodec/ppc/idct_altivec.c
libavcodec/ppc/int_altivec.c
libavcodec/ppc/mpegaudiodec_altivec.c
libavcodec/ppc/mpegvideo_altivec.c
libavcodec/ppc/vc1dsp_altivec.c
libavcodec/ppc/vp3dsp_altivec.c
libavcodec/ppc/vp8dsp_altivec.c
libavcodec/ra288.c
libavcodec/twinvq.c
libavcodec/vc1dsp.c
libavcodec/vorbisdec.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_yasm.asm
libavutil/Makefile
libavutil/arm/asm.S
libavutil/arm/float_dsp_arm.h
libavutil/arm/float_dsp_init_arm.c
libavutil/arm/float_dsp_init_vfp.c
libavutil/arm/float_dsp_vfp.S
libavutil/float_dsp.h
libavutil/ppc/float_dsp_altivec.c
libavutil/ppc/float_dsp_altivec.h
libavutil/ppc/float_dsp_init.c
libavutil/ppc/types_altivec.h
libavutil/ppc/util_altivec.h
libavutil/x86/float_dsp_init.c