Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 27 Jul 2012 21:42:19 +0000 (23:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 27 Jul 2012 21:42:19 +0000 (23:42 +0200)
commitc6963a220d5849fd5399c056b21ec66de7a0df37
tree142ce617e997fd542f0f2ccd460212b5a3dc6835
parent94c3e11a6f62bf13a7e6f1b9287c6112bf6ee445
parent5361e10a5e8740146c09a115477310c77b927215
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  proresdsp: port x86 assembly to cpuflags.
  lavr: x86: improve non-SSE4 version of S16_TO_S32_SX macro
  lavfi: better channel layout negotiation
  alac: check for truncated packets
  alac: reverse lpc coeff order, simplify filter
  lavr: add x86-optimized mixing functions
  x86: add support for fmaddps fma4 instruction with abstraction to avx/sse
  tscc2: fix typo in array index
  build: use COMPILE template for HOSTOBJS
  build: do full flag handling for all compiler-type tools
  eval: fix printing of NaN in eval fate test.
  build: Rename aandct component to more descriptive aandcttables
  mpegaudio: bury inline asm under HAVE_INLINE_ASM.
  x86inc: automatically insert vzeroupper for YMM functions.
  rtmp: Check the buffer length of ping packets
  rtmp: Allow having more unknown data at the end of a chunk size packet without failing
  rtmp: Prevent reading outside of an allocate buffer when receiving server bandwidth packets

Conflicts:
Makefile
configure
libavcodec/x86/proresdsp.asm
libavutil/eval.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
17 files changed:
common.mak
configure
doc/Makefile
libavcodec/Makefile
libavcodec/alac.c
libavcodec/tscc2.c
libavcodec/x86/dsputil_yasm.asm
libavcodec/x86/fft_mmx.asm
libavcodec/x86/mpegaudiodec_mmx.c
libavcodec/x86/proresdsp.asm
libavfilter/avfiltergraph.c
libavformat/rtmpproto.c
libavresample/utils.c
libavutil/eval.c
libavutil/x86/float_dsp.asm
libavutil/x86/x86inc.asm
tests/Makefile