summaryrefslogtreecommitdiff
path: root/merge_frames.py
diff options
context:
space:
mode:
authorJules Laplace <julescarbon@gmail.com>2019-01-16 02:35:05 +0100
committerJules Laplace <julescarbon@gmail.com>2019-01-16 02:35:05 +0100
commit2085a45ca753ac5fbcec677298442eb5a789c1c1 (patch)
tree0488ce161277fb70afb53ff4c2ff66e5ce60d178 /merge_frames.py
parentb61ef3c57798dd3ecc67ec1f4d207f0520a89f43 (diff)
parente2b228dd82377c71bfb8a9d35cdc53838488aef6 (diff)
Merge branch 'master' of asdf.us:vsr-duf
Diffstat (limited to 'merge_frames.py')
-rw-r--r--merge_frames.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/merge_frames.py b/merge_frames.py
index 7dd7f25..5d42950 100644
--- a/merge_frames.py
+++ b/merge_frames.py
@@ -32,7 +32,7 @@ def make_movie(merge_dir, out_fn):
'-crf', '19',
'-vf', 'fps=25',
'-pix_fmt', 'yuv420p',
- os.path.join(opt.render_dir, out_fn + '.mp4')
+ os.path.join(args.render_dir, out_fn + '.mp4')
])
def merge_files(file, crop_dir_list, ww, hh, overlap, merge_dir):
@@ -87,7 +87,7 @@ def merge_dir():
pool.starmap(merge_files, dataset, chunksize)
if args.mov:
- make_movie(merge_dir, opt.out_fn)
+ make_movie(merge_dir, args.out_fn)
if __name__ == "__main__":
merge_dir()