diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-16 17:23:32 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-16 17:23:32 +0000 |
| commit | 04e4166536d3fb51ee9b9361de2a414fa876ab6e (patch) | |
| tree | 6c46410d8346b3590e086abf4d2a0986aa37c923 /libavcodec/x86/v210enc_init.c | |
| parent | 6bff2b5f6a3dca43bf553866b0f110c47d4ec72d (diff) | |
| parent | e280fe13291e9c712a5f4aa13b5263f3e8afed45 (diff) | |
Merge commit 'e280fe13291e9c712a5f4aa13b5263f3e8afed45'
* commit 'e280fe13291e9c712a5f4aa13b5263f3e8afed45':
v210: Use separate sample_factors
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/x86/v210enc_init.c')
| -rw-r--r-- | libavcodec/x86/v210enc_init.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/x86/v210enc_init.c b/libavcodec/x86/v210enc_init.c index 8abb152c4f..e997b4b67a 100644 --- a/libavcodec/x86/v210enc_init.c +++ b/libavcodec/x86/v210enc_init.c @@ -45,9 +45,10 @@ av_cold void ff_v210enc_init_x86(V210EncContext *s) if (EXTERNAL_AVX(cpu_flags)) s->pack_line_8 = ff_v210_planar_pack_8_avx; - if (EXTERNAL_AVX2_FAST(cpu_flags)) { - s->pack_line_8 = ff_v210_planar_pack_8_avx2; - s->pack_line_10 = ff_v210_planar_pack_10_avx2; - s->sample_factor = 2; + if (EXTERNAL_AVX2(cpu_flags)) { + s->sample_factor_8 = 2; + s->pack_line_8 = ff_v210_planar_pack_8_avx2; + s->sample_factor_10 = 2; + s->pack_line_10 = ff_v210_planar_pack_10_avx2; } } |