diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-16 17:02:03 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-16 17:02:56 +0000 |
| commit | 8f8381bf03648c583aec1d74e6af406460005ca8 (patch) | |
| tree | 1d58d7fe422db5697b96a1ef026abee80a119573 | |
| parent | 4401f07f4daac9167dfffc9080c3a978dd36534b (diff) | |
| parent | eafb05fcf37cd19a910ca3b17824384f9006bc0a (diff) | |
| download | ffmpeg-streaming-8f8381bf03648c583aec1d74e6af406460005ca8.zip ffmpeg-streaming-8f8381bf03648c583aec1d74e6af406460005ca8.tar.gz | |
Merge commit 'eafb05fcf37cd19a910ca3b17824384f9006bc0a'
* commit 'eafb05fcf37cd19a910ca3b17824384f9006bc0a':
v210: x86: Add the correct guards around the asm code
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| -rw-r--r-- | libavcodec/x86/v210enc.asm | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/x86/v210enc.asm b/libavcodec/x86/v210enc.asm index 0545454..965f2be 100644 --- a/libavcodec/x86/v210enc.asm +++ b/libavcodec/x86/v210enc.asm @@ -93,8 +93,10 @@ cglobal v210_planar_pack_10, 5, 5, 4+cpuflag(avx2), y, u, v, dst, width RET %endmacro +%if HAVE_SSSE3_EXTERNAL INIT_XMM ssse3 v210_planar_pack_10 +%endif %if HAVE_AVX2_EXTERNAL INIT_YMM avx2 @@ -167,10 +169,14 @@ cglobal v210_planar_pack_8, 5, 5, 7, y, u, v, dst, width RET %endmacro +%if HAVE_SSSE3_EXTERNAL INIT_XMM ssse3 v210_planar_pack_8 +%endif +%if HAVE_AVX_EXTERNAL INIT_XMM avx v210_planar_pack_8 +%endif %if HAVE_AVX2_EXTERNAL INIT_YMM avx2 |
