diff --git a/src/filmstab.py b/src/filmstab.py index f3dbe36..be57e8c 100644 --- a/src/filmstab.py +++ b/src/filmstab.py @@ -1,6 +1,6 @@ """ - Copyright 2023 Alexander Borisov + Copyright 2024 Alexander Borisov This file is part of FilmScanStabilizer. @@ -26,7 +26,7 @@ import json # Create the parser parser = argparse.ArgumentParser(usage='%(prog)s [options] path', - description='Film stabilisation') + description='Film stabilization') # Add the arguments parser.add_argument('Path', @@ -69,7 +69,11 @@ if len(sys.argv) == 1 : sys.exit(1) +<<<<<<< HEAD class Stablilizer: +======= +class FilmScanStablilizer: +>>>>>>> a216d1d788344c515a06be2bffb8066f358cdd4e fr_count = 0 fr_cur = 0 @@ -349,7 +353,11 @@ alert("Keyframes are loaded."); if __name__ == '__main__': +<<<<<<< HEAD stab = Stablilizer() +======= + stab = FilmScanStablilizer() +>>>>>>> a216d1d788344c515a06be2bffb8066f358cdd4e stab.main() stab.writeAeScript()