• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · c6963a22
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    c6963a22
mpegaudiodec_mmx.c 10.2 KB