• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · d8c3170c
    Michael Niedermayer authored
    * qatar/master: (22 commits)
      g723.1: do not pass large structs by value
      g723.1: do not bounce intermediate values via memory
      g723.1: declare a variable in the block it is used
      g723.1: avoid saving/restoring excitation
      g723.1: avoid unnecessary memcpy() in residual_interp()
      g723.1: make postfilter write directly to output buffer
      g723.1: drop unnecessary variable buf_ptr in formant_postfilter()
      g723.1: make scale_vector() output to a separate buffer
      g723.1: make autocorr_max() work on an arbitrary buffer
      g723.1: do not needlessly use int64_t
      g723.1: use saturating addition functions
      g723.1: optimise scale_vector()
      g723.1: remove useless uses of MUL64()
      g723.1: remove unnecessary argument 'shift' from dot_product()
      g723.1: deobfuscate "(x << 4) - x" to "15 * x"
      celp: optimise ff_celp_lp_synthesis_filter()
      libavutil: add saturating addition functions
      cllc: Implement ARGB support
      cllc: Add support for QRGB
      cllc: Rename some funcs to represent what they actually do
      ...
    
    Conflicts:
    	LICENSE
    	libavcodec/g723_1.c
    	libavcodec/x86/Makefile
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    d8c3170c
common.h 12 KB