blackteay/ffmpeg-python
1
0
Fork 0
mirror of https://github.com/kkroening/ffmpeg-python.git synced 2025-04-06 04:15:44 +08:00
Code Issues Projects Releases Wiki Activity
300 Commits 13 Branches 14 Tags
Commit Graph

9 Commits

Author SHA1 Message Date
Davide Depau
5b564d7926
Merge 34cc51d95d915fb2400e50c1c04e088520f41c75 into 7077eaad646e84004fbdeb052b034f9f68c15b5e 2018-05-09 06:31:19 +00:00
Davide Depau
34cc51d95d
Replace OrderedDict.move_to_end with Python2-compatible alternative 2018-01-26 16:13:39 +01:00
Davide Depau
b7455d3261
Move OrderedDict sorting code to own function 2018-01-26 16:02:31 +01:00
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