Merge branch 'hotfix-1.2.2' into develop

Added checking for sane -a and -v values
Merge branch 'hotfix-1.2.1' into develop
2012-09-03 13:05:52 +02:00 · 2012-09-03 13:02:40 +02:00 · 2012-08-29 11:57:09 +02:00 · 2012-08-29 11:54:54 +02:00 · 2012-08-29 10:51:57 +02:00 · 2012-08-29 10:47:20 +02:00
1 changed files with 11 additions and 3 deletions
--- a/n900-encode.py
+++ b/n900-encode.py
@ -4,7 +4,7 @@
 # n900-encode.py: Encode almost any Video to an Nokia N900-compatible format (h264,aac,mp4)
 # Disclaimer: This program is provided without any warranty, USE AT YOUR OWN RISK!
 #
-# Version 1.2 (23.03.2012)
+# Version 1.2.2 (03.08.2012)
 #
 # (C) 2010-2012 Stefan Brand <seiichiro@seiichiro0185.org>
 #
@ -70,9 +70,17 @@ def main(argv):
 		elif opt in ("-m" "--mpopts"):
 			mpopts = arg
 		elif opt in ("-a", "--abitrate"):
-			abitrate = int(arg) * 1000
+			try:
+				abitrate = int(arg) * 1000
+			except ValueError:
+				print("Error: invalid value for audio bitrate!")
+				usage()
 		elif opt in ("-v", "--vbitrate"):
-			vbitrate = int(arg)
+			try:
+				vbitrate = int(arg)
+			except ValueError:
+				print("Error: Invalid value for video bitrate!")
+				usage()
 		elif opt in ("-t", "--threads"):
 			threads = arg
 		elif opt in ("-f", "--force-overwrite"):
Author	SHA1	Message	Date
Stefan Brand	153c974fa3	Merge branch 'hotfix-1.2.2' into develop	2012-09-03 13:05:52 +02:00
Stefan Brand	50bb00be4c	Added checking for sane -a and -v values	2012-09-03 13:02:40 +02:00
Stefan Brand	28a44fb38d	Merge branch 'hotfix-1.2.1' into develop	2012-08-29 11:57:09 +02:00
Stefan Brand	30359c25dd	Added more error handling	2012-08-29 11:54:54 +02:00
Stefan Brand	a0ed152846	Added Error handling for missing input file	2012-08-29 10:51:57 +02:00
Stefan Brand	7fc87e6be9	Added some error handling for invalid commandline options	2012-08-29 10:47:20 +02:00
Stefan Brand	b60e8edf7a	Removed the unneeded exit from the cleanup function	2012-08-29 10:35:10 +02:00
Andrwe Lord Weber	05ef2a0f8c	Deleted a misplaced tab	2012-08-29 10:31:46 +02:00
Stefan Brand	1349160c16	Merge branch 'release-1.2' into develop	2012-03-23 20:29:48 +01:00
Stefan Brand	d93dd60a40	Version bump to 1.2	2012-03-23 20:23:30 +01:00
Stefan Brand	847ad0c99b	Merge branch 'feat-crf' into develop	2012-03-23 20:22:01 +01:00
Stefan Brand	851484e0bb	Encoder Tweaks and Fixes Some Fixes for the CRF-Encoding Encoding Tweaks for Playback on the Nokia N9	2012-03-23 20:20:12 +01:00
Stefan Brand	89d9b96f9d	Added posibility for CRF-Encoding Bitrate <= 51 will be treated as a CRF-Factor, Bitrate > 52 will be treated as a constant bitrate.	2012-03-23 18:41:38 +01:00
Stefan Brand	d27991cbd1	Merge branch 'hot-readme' into develop	2012-02-23 08:45:41 +01:00
Stefan Brand	d05076999c	Fixed README Formating	2012-02-23 08:42:13 +01:00
Stefan Brand	c938df06ef	Merge branch 'release-1.1' into develop	2012-02-22 21:03:10 +01:00
Stefan Brand	acd531cadd	Version bump to 1.1	2012-02-22 20:55:40 +01:00
Stefan Brand	2a7bae6e1c	Merge branch 'feat-ffmpeg' into develop Switched to encoding with ffmpeg 0.10	2012-02-22 20:52:45 +01:00
Stefan Brand	8ad7149f26	Changed Prequisites in README	2012-02-22 20:50:25 +01:00
Stefan Brand	2bdce59493	adapted encoding command to ffmpeg	2012-02-22 20:48:43 +01:00
Stefan Brand	e948e11177	Merge branch 'feat-py3support' into develop	2012-02-22 19:33:12 +01:00
Stefan Brand	fc153ba08f	adjusted exit handling to python 3	2012-02-22 19:31:45 +01:00
Stefan Brand	121f6def82	print statments converted to functions	2012-02-22 19:22:47 +01:00