Merge remote-tracking branch 'mans/ac3'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Oct 2011 09:11:08 +0000 (11:11 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Oct 2011 09:11:08 +0000 (11:11 +0200)
commitd8cae42d72092501be880348ae0c223d2ea220a2
tree9f5cd163810d5e7babd864637b10968c99814ab8
parentd3d97d43d51840086d86728bbfcd072eea7a5b85
parent9d4bbf6d4f3a0b78c4ec7a1f366adf5c3cc8ea1a
Merge remote-tracking branch 'mans/ac3'

* mans/ac3:
  ac3enc: slightly faster quantize_mantissas_blk_ch()
  ac3enc: NEON optimised sum_square_butterfly_float
  ac3enc: neon optimised sum_square_butterfly_int32
  ac3enc: move inner loop of compute_rematrixing_strategy to ac3dsp

Conflicts:
libavcodec/ac3enc_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/ac3dsp.c
libavcodec/ac3dsp.h
libavcodec/ac3enc.c
libavcodec/ac3enc_fixed.c
libavcodec/ac3enc_float.c
libavcodec/ac3enc_template.c
libavcodec/arm/ac3dsp_init_arm.c