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

457 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Karl Kroening
39466beb62 Merge branch 'feature/17' into feature/18 2017-07-06 02:37:40 -06:00
Karl Kroening
b7fc331722 Add split operator 2017-07-06 02:32:45 -06:00
Karl Kroening
543cd1b4e3 #18: improve edge labelling 2017-07-06 02:32:30 -06:00
Karl Kroening
1955547202 #18: fix to use latest #17 changes 2017-07-06 02:24:40 -06:00
Karl Kroening
656d9fa7f7 Merge branch 'feature/17' into feature/18 2017-07-06 02:23:55 -06:00
Karl Kroening
6887ad8bac Massive refactor to break nodes into streams+nodes 2017-07-06 02:23:13 -06:00
Karl Kroening
37c2094a9c Rename graph.py to _view.py; handle graphviz import errors; use tempfile 2017-07-05 22:30:00 -06:00
Karl Kroening
7613f746d2 Merge branch 'feature/17' into feature/18 2017-07-05 04:52:55 -06:00
Karl Kroening
aa5156d9c9 #17: allow multiple outgoing edges with same label 2017-07-05 04:52:45 -06:00
Karl Kroening
241ede2271 #18: add initial graph.py 2017-07-05 04:23:35 -06:00
Karl Kroening
11a24d0432 #17: fix get_outgoing_edges 2017-07-05 04:23:05 -06:00
Karl Kroening
fc07f6c4fa #17: remove Node._parents 2017-07-05 04:07:30 -06:00
Karl Kroening
7236984626 #17: don't rely on in 2017-07-05 03:31:29 -06:00
Karl Kroening
677967b4c2 Merge remote-tracking branch 'origin/master' into feature/17 
Conflicts:
	ffmpeg/_run.py
	ffmpeg/nodes.py
 2017-07-05 03:19:43 -06:00
Karl Kroening
a986cbe9fb Merge remote-tracking branch 'origin/master' 2017-07-05 03:14:30 -06:00
Karl Kroening
6a9a12e718 #17: move graph stuff to dag.py; add edge labelling 2017-07-05 03:13:30 -06:00
Karl Kroening
fc946be164 Pull in _NodeBase from actorgraph; include short-hash in repr 2017-07-04 17:45:20 -06:00
Karl Kroening
89f91535c6 Merge pull request #18 from Depaulicious/assert-remove 
Convert assertions to if+raise
 2017-07-02 14:14:19 -06:00
Davide Depau
086613bb09 convert assertions to if+raise 2017-06-30 15:54:09 +02:00
Karl Kroening
dcebe917a7 Update docs 2017-06-29 00:17:01 -06:00
Karl Kroening
d4b8900646 Merge pull request #16 from kkroening/cleanup-hashing 
Cleanup hashing
 2017-06-17 01:19:04 -06:00
Karl Kroening
f1e6212765 Clean up hashing 2017-06-17 00:14:18 -06:00
Karl Kroening
1439c885e0 Merge pull request #15 from Depaulicious/patch-1 
Add docstring to `merge_output`
 2017-06-16 22:55:24 -06:00
Karl Kroening
e3a846b312 Remove .python-version 2017-06-16 15:53:43 -06:00
Davide Depau
31f19e184e add docstring to merge_output 2017-06-16 15:13:52 +02:00
Karl Kroening
b002e8c31b Update setup.py v0.1.6 2017-06-15 23:13:03 -06:00
Karl Kroening
190593b35f Bump version: 0.1.6 test 2017-06-15 23:10:13 -06:00
Karl Kroening
36c4a97393 Merge pull request #14 from kkroening/io-flags 
Support input/output parameters
 2017-06-15 19:10:59 -06:00
Karl Kroening
45f1494167 Merge pull request #12 from kkroening/support-python3 
Add support for Python3 (fixes #10)
 2017-06-15 19:10:50 -06:00
Karl Kroening
525b1bf452 Make input/output cmd-line args deterministically sorted 2017-06-14 02:25:58 -06:00
Karl Kroening
f4025b464f Add comment in test 2017-06-14 02:14:57 -06:00
Karl Kroening
7824092ccc Add whitespace 2017-06-14 02:12:52 -06:00
Karl Kroening
03f99dbba0 Support input/output parameters 2017-06-14 02:07:23 -06:00
Karl Kroening
26e7cff382 Fix check in travis.yml 2017-06-14 00:21:59 -06:00
Karl Kroening
ac1f89ba55 Test travis ffmpeg download caching 2017-06-14 00:11:29 -06:00
Karl Kroening
9c22a16360 Yet more travis yaml 2017-06-13 23:46:44 -06:00
Karl Kroening
f5410a87c0 Fix travis yaml syntax 2017-06-13 23:43:32 -06:00
Karl Kroening
1c5418dd63 Cache ffmpeg download on travis 2017-06-13 23:40:15 -06:00
Karl Kroening
06cf7c73c7 More travis config 2017-06-13 23:36:11 -06:00
Karl Kroening
f2ae3c7e6f Try different travis config 2017-06-13 23:34:06 -06:00
Karl Kroening
6960751de0 Make setup.py test work 2017-06-13 23:29:52 -06:00
Karl Kroening
d0e226e263 Add tox support 2017-06-13 23:18:19 -06:00
Karl Kroening
cd3d3715b8 Support python3 2017-06-13 19:37:14 -06:00
Karl Kroening
eb9e8270cd Improve fluent style 2017-06-03 20:08:43 -07:00
Karl Kroening
a1c4c9b04d Update readme 2017-05-28 00:18:04 -10:00
Karl Kroening
0224e2d6ba Update readme 2017-05-27 23:45:30 -10:00
Karl Kroening
f73acee856 Update readme 2017-05-27 23:39:48 -10:00
Karl Kroening
2d2d3d7f95 Update readme 2017-05-27 23:30:04 -10:00
Karl Kroening
2fbb5e4e0c Update readme 2017-05-27 23:27:20 -10:00
Karl Kroening
4b54df2b57 Update readme 2017-05-27 23:25:57 -10:00