6 Commits

Author	SHA1	Message	Date
Davide Depau	df9bd7316f	Replace past.builtins.basestring with a custom one to workaround bug in Ubuntu's Python3	2018-01-09 16:04:33 +01:00
Karl Kroening	7b2d8b63fc	Merge remote-tracking branch 'origin/master' into feature/17 ... Conflicts: ffmpeg/_filters.py ffmpeg/_utils.py ffmpeg/nodes.py ffmpeg/tests/test_ffmpeg.py	2017-07-12 02:08:19 -06:00
Karl Kroening	c19dcaca30	Fix drawbox=>drawtext	2017-07-12 01:18:48 -06:00
Karl Kroening	5f4bfd1fb3	Robustly handle string escaping	2017-07-12 00:33:43 -06:00
Karl Kroening	662c56eb5b	#17: fix python 3 support	2017-07-06 02:50:22 -06:00
Karl Kroening	6887ad8bac	Massive refactor to break nodes into streams+nodes	2017-07-06 02:23:13 -06:00