Merge remote branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 16 May 2011 03:01:24 +0000 (05:01 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 16 May 2011 03:01:40 +0000 (05:01 +0200)
* qatar/master:
  aacdec: Use float instead of int16_t for ltp_state to avoid needless rounding.
  acelp: Remove unused gray_decode table.
  dfa: Remove unused variable.
  configure: Include AVX availability in summary output.
  configure: use same CPPFLAGS in kFreeBSD as Linux

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure
libavcodec/aac.h
libavcodec/aacdec.c
libavcodec/acelp_vectors.c

diff --cc configure
Simple merge
Simple merge
Simple merge
Simple merge