Merge commit '1a880b2fb8456ce68eefe5902bac95fea1e6a72d'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 26 Jul 2014 22:19:25 +0000 (00:19 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 26 Jul 2014 22:20:48 +0000 (00:20 +0200)
commit706f81a2c27552fdc9d216834eedd36f5804c080
tree46931fd1a7d52b2d6c815adc2a24dec1429893b3
parent226b290f9f73d691ef1423d5c105f0bb0577d588
parent1a880b2fb8456ce68eefe5902bac95fea1e6a72d
Merge commit '1a880b2fb8456ce68eefe5902bac95fea1e6a72d'

* commit '1a880b2fb8456ce68eefe5902bac95fea1e6a72d':
  hevc: SSE2 and SSSE3 loop filters

Conflicts:
libavcodec/hevcdsp.c
libavcodec/hevcdsp.h
libavcodec/x86/Makefile
libavcodec/x86/hevc_deblock.asm
libavcodec/x86/hevcdsp_init.c

See: de7b89fd43f850d77cf24ad6ae50185dfe391e91 and several others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/hevcdsp.c
libavcodec/hevcdsp.h
libavcodec/x86/hevc_deblock.asm
libavcodec/x86/hevcdsp_init.c