Merge commit '9a738c27dceb4b975784b23213a46f5cb560d1c2'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 6 Dec 2014 00:46:39 +0000 (01:46 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 6 Dec 2014 00:54:10 +0000 (01:54 +0100)
commit1d048f762d2fc4ede5316818f467e2f1d1065ac1
tree3667fa5304938b04abb0b636f32ae7cfe0e55657
parente827f65618f601ae2016e6f8ac8851534ed346c8
parent9a738c27dceb4b975784b23213a46f5cb560d1c2
Merge commit '9a738c27dceb4b975784b23213a46f5cb560d1c2'

* commit '9a738c27dceb4b975784b23213a46f5cb560d1c2':
  v210enc: Add SIMD optimised 8-bit and 10-bit encoders

Conflicts:
libavcodec/v210enc.c
libavcodec/v210enc.h
libavcodec/x86/Makefile
libavcodec/x86/v210enc.asm
libavcodec/x86/v210enc_init.c
tests/ref/vsynth/vsynth1-v210
tests/ref/vsynth/vsynth2-v210

See: 36091742d182b3ad4411aae22682354b3834a974
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/v210enc.c
libavcodec/v210enc.h
libavcodec/x86/v210enc_init.c