Merge branch 'develop' of https://gitverse.ru/cinereel/FilmScanStabilizer into develop
# Conflicts: # src/filmstab.py
This commit is contained in:
commit
92f5e69f15
@ -1,6 +1,6 @@
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
Copyright 2023 Alexander Borisov <borisov@cinereel.ru>
|
Copyright 2024 Alexander Borisov <borisov@cinereel.ru>
|
||||||
|
|
||||||
This file is part of FilmScanStabilizer.
|
This file is part of FilmScanStabilizer.
|
||||||
|
|
||||||
@ -26,7 +26,7 @@ import json
|
|||||||
|
|
||||||
# Create the parser
|
# Create the parser
|
||||||
parser = argparse.ArgumentParser(usage='%(prog)s [options] path',
|
parser = argparse.ArgumentParser(usage='%(prog)s [options] path',
|
||||||
description='Film stabilisation')
|
description='Film stabilization')
|
||||||
|
|
||||||
# Add the arguments
|
# Add the arguments
|
||||||
parser.add_argument('Path',
|
parser.add_argument('Path',
|
||||||
@ -69,7 +69,11 @@ if len(sys.argv) == 1 :
|
|||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
class Stablilizer:
|
class Stablilizer:
|
||||||
|
=======
|
||||||
|
class FilmScanStablilizer:
|
||||||
|
>>>>>>> a216d1d788344c515a06be2bffb8066f358cdd4e
|
||||||
|
|
||||||
fr_count = 0
|
fr_count = 0
|
||||||
fr_cur = 0
|
fr_cur = 0
|
||||||
@ -349,7 +353,11 @@ alert("Keyframes are loaded.");
|
|||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
stab = Stablilizer()
|
stab = Stablilizer()
|
||||||
|
=======
|
||||||
|
stab = FilmScanStablilizer()
|
||||||
|
>>>>>>> a216d1d788344c515a06be2bffb8066f358cdd4e
|
||||||
stab.main()
|
stab.main()
|
||||||
stab.writeAeScript()
|
stab.writeAeScript()
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user