Commit af1411c

committed

fix compiling ffmpeg and avconv

1 parent aa9ab25 commit af1411cCopy full SHA for af1411c

File tree

-12

lines changed

-12

lines changed

Lines changed: 3 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,13 +33,11 @@ def is_exe(fpath):`
`33`	`33`
`34`	`34`	`if not ffmpeg_cmd and not avconv_cmd:`
`35`	`35`	`print 'Unable to find ffmpeg or avconve command'`
`36`		`- sys.exit(0)`
`37`		`-`
`38`		`-`
	`36`	`+ sys.exit(-1)`
`39`	`37`
`40`	`38`	`def testsrc(size, frame_rate, time, out_path, vcodec=None, bitrate=None, pix_fmt=None, use_avconv=False):`
`41`	`39`	`exec_cmd = ffmpeg_cmd`
`42`		`- if use_avconv:`
	`40`	`+ if use_avconvoros.environ.get('LIBRARY', None) =='libav':`
`43`	`41`	`exec_cmd = avconv_cmd`
`44`	`42`
`45`	`43`	`exec_cmd.extend(['testsrc=size=%s:rate=%s' % (size, str(frame_rate)), '-t', str(time)])`
`@@ -59,7 +57,7 @@ def testsrc(size, frame_rate, time, out_path, vcodec=None, bitrate=None, pix_fmt`
`59`	`57`
`60`	`58`	`def main():`
`61`	`59`	`parser = optparse.OptionParser()`
`62`		`- parser.add_option('-r', '--rate', help="Frame Rate", default=25, type="int")`
	`60`	`+ parser.add_option('-r', '--rate', help="Frame Rate", default=24, type="string")`
`63`	`61`	`parser.add_option('-t', '--time', help="Duration in seconds.", default=5, type="int")`
`64`	`62`	`parser.add_option('-s', '--size', help="size of testsrc", default='640x480')`
`65`	`63`	`parser.add_option('-v', '--vcodec', help="video codec", default='mpeg4')`

Lines changed: 2 additions & 7 deletions

Comments

(0)