From: Urban Wallasch <urban.wallasch@freenet.de>
Date: Mon, 3 May 2021 09:53:50 +0000 (+0200)
Subject: * Fixed argument precedence and help text.
X-Git-Tag: v0.1~27
X-Git-Url: https://git.packet-gain.de/?a=commitdiff_plain;h=3a27af118ba06ab6c07c79ab3048fe2b2fbc3365;p=ffpreview.git

* Fixed argument precedence and help text.
---

diff --git a/ffpreview.py b/ffpreview.py
index 6212a64..5036133 100755
--- a/ffpreview.py
+++ b/ffpreview.py
@@ -101,7 +101,7 @@ cfg.scene_thresh = None
 # parse command line arguments
 parser = argparse.ArgumentParser(
     description='Generate clickable video thumbnail preview.',
-    epilog='The -i, -f and -s options are mutually exclusive, the last one specified wins.'
+    epilog='The -i, -n and -s options are mutually exclusive, -i beats -n beats -s.'
 )
 parser.add_argument('filename', help='input video file')
 parser.add_argument('-c', '--grid_cols', type=int, metavar='N', help='number of columns in thumbnail preview ')
@@ -125,8 +125,11 @@ if args.scene:
     cfg.method = 'scene'
 if args.nskip:
     cfg.frame_skip = args.nskip
+    cfg.scene_thresh = None
     cfg.method = 'skip'
 if args.iframe:
+    cfg.frame_skip = None
+    cfg.scene_thresh = None
     cfg.method = 'iframe'
 
 # prepare thumbnail directory