Merge commit '6d5636ad9ab6bd9bedf902051d88b7044385f88b'
authorClément Bœsch <u@pkh.me>
Fri, 24 Mar 2017 11:29:21 +0000 (12:29 +0100)
committerClément Bœsch <u@pkh.me>
Fri, 24 Mar 2017 11:33:25 +0000 (12:33 +0100)
commit3d6535983282bea542dac2e568ae50da5796be34
tree0dae743f60adad35e1bd088d1447eb99cc988d91
parent40ac226014082682e504e8af613ed4169221ac36
parent6d5636ad9ab6bd9bedf902051d88b7044385f88b
Merge commit '6d5636ad9ab6bd9bedf902051d88b7044385f88b'

* commit '6d5636ad9ab6bd9bedf902051d88b7044385f88b':
  hevc: x86: Add add_residual() SIMD optimizations

See a6af4bf64dae46356a5f91537a1c8c5f86456b37

This merge is only cosmetics (renames, space shuffling, etc).

The functionnal changes in the ASM are *not* merged:
- unrolling with %rep is kept
- ADD_RES_MMX_4_8 is left untouched: this needs investigation

Merged-by: Clément Bœsch <u@pkh.me>
doc/libav-merge.txt
libavcodec/hevcdsp.h
libavcodec/x86/hevc_add_res.asm
libavcodec/x86/hevcdsp.h
libavcodec/x86/hevcdsp_init.c