diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-05 19:16:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-05 19:16:39 +0200 |
| commit | ebb21887b853ffd2ae6eedddef39e13c91bc7956 (patch) | |
| tree | 95a94b931393cb99f27ecffddf14cd1012b0926f /libavfilter/x86 | |
| parent | 865c94bb57dbb44b0855bba66cd4a11b28cc6ba2 (diff) | |
| parent | 01c5779f56cf708e6cb88b11cfdc248cae7e2ee8 (diff) | |
| download | ffmpeg-ebb21887b853ffd2ae6eedddef39e13c91bc7956.tar.gz | |
Merge commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8'
* commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8':
x86: Drop some unnecessary YASM ifdefs
Conflicts:
libavfilter/x86/vf_yadif_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/x86')
| -rw-r--r-- | libavfilter/x86/vf_yadif_init.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavfilter/x86/vf_yadif_init.c b/libavfilter/x86/vf_yadif_init.c index 10ebd230de..1460a642c3 100644 --- a/libavfilter/x86/vf_yadif_init.c +++ b/libavfilter/x86/vf_yadif_init.c @@ -60,7 +60,6 @@ void ff_yadif_filter_line_10bit_ssse3(void *dst, void *prev, void *cur, av_cold void ff_yadif_init_x86(YADIFContext *yadif) { -#if HAVE_YASM int cpu_flags = av_get_cpu_flags(); int bit_depth = (!yadif->csp) ? 8 : yadif->csp->comp[0].depth_minus1 + 1; @@ -95,5 +94,4 @@ av_cold void ff_yadif_init_x86(YADIFContext *yadif) if (EXTERNAL_SSSE3(cpu_flags)) yadif->filter_line = ff_yadif_filter_line_ssse3; } -#endif /* HAVE_YASM */ } |