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
350 Commits 13 Branches 14 Tags
Commit Graph

350 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Karl Kroening
7c872c56b9
Merge pull request #97 from kkroening/concat-av 
Support `concat` a/v params
 2018-06-30 02:23:47 -07:00
Karl Kroening
0f18c75dab Support concat a/v params 2018-06-30 02:17:00 -07:00
Karl Kroening
c4ebc01978
Update README.md 2018-06-28 00:14:30 -07:00
Karl Kroening
86d2a3b5e4
Update README.md 2018-06-28 00:07:58 -07:00
Karl Kroening
c6ab775d6f
Update README.md 2018-06-27 23:55:38 -07:00
Karl Kroening
5474c73d3f
Update README.md 2018-06-27 23:54:24 -07:00
Karl Kroening
122e7bc2e2 Release 0.1.14 0.1.14 2018-06-27 23:51:50 -07:00
Karl Kroening
3834d27a2a
Update README.md 2018-06-27 23:49:54 -07:00
Karl Kroening
5da7cdd1ea
Update README.md 2018-06-27 23:43:12 -07:00
Karl Kroening
be834e04b3
Update examples readme 2018-06-27 23:42:32 -07:00
Karl Kroening
3520e9318d
Merge pull request #94 from kkroening/jupyter-demo 
Add jupyter demo
 2018-06-27 23:41:41 -07:00
Karl Kroening
2c9b39214e
Update examples readme 2018-06-27 23:41:14 -07:00
Karl Kroening
a82f1c93ca Add jupyter demo 2018-06-27 23:37:39 -07:00
Karl Kroening
a0caa7b017
Merge pull request #93 from kkroening/view-pipe 
Add `pipe` param to `view`
 2018-06-27 23:36:31 -07:00
Karl Kroening
4f97d1d679 Add pipe param to view 2018-06-27 23:35:54 -07:00
Karl Kroening
e6d09f532a Update setup.py description 2018-06-27 22:53:37 -07:00
Karl Kroening
fc9fd015e6 Release version 0.1.13 0.1.13 2018-06-27 22:50:58 -07:00
Karl Kroening
57eeea2356
Merge pull request #87 from kkroening/feature-80 
Add `video_bitrate` and `audio_bitrate` params
 2018-06-17 21:34:54 -05:00
Karl Kroening
0cc0bfaaaa Merge remote-tracking branch 'origin/master' into feature-80 
Conflicts:
	ffmpeg/_run.py
	ffmpeg/tests/test_ffmpeg.py
 2018-06-16 14:42:41 -05:00
Karl Kroening
1681e8c8df
Update README.md 2018-06-15 23:24:24 -05:00
Karl Kroening
3be068ae1a
Update README.md 2018-06-15 23:21:52 -05:00
Karl Kroening
fbaab995b7 Update jupyter screenshot 2018-06-02 02:45:24 -07:00
Karl Kroening
bc07a19090
Update examples readme 2018-06-02 02:41:30 -07:00
Karl Kroening
f2548aa7e5
Merge pull request #89 from kkroening/examples-readme 
Update examples README.md
 2018-06-02 02:40:06 -07:00
Karl Kroening
e5276f4297
Update examples readme 2018-06-02 02:39:50 -07:00
Karl Kroening
01d0945689 Merge remote-tracking branch 'origin/examples-readme' into examples-readme 2018-06-02 02:36:54 -07:00
Karl Kroening
1cf6dcb81a
Update examples readme 2018-06-02 02:36:45 -07:00
Karl Kroening
8f0f53411f Add jupyter screenshot 2018-06-02 02:36:08 -07:00
Karl Kroening
5af85c889d
Update examples readme 2018-06-02 02:31:33 -07:00
Karl Kroening
bf87179efe
Update README.md 2018-06-02 02:21:59 -07:00
Karl Kroening
ef390042e5 Add initial examples readme 2018-06-02 02:19:58 -07:00
Karl Kroening
de124673e0 Update examples 2018-06-02 02:17:56 -07:00
Karl Kroening
6364513485 Fix get_video_thumbnail example 2018-06-02 01:05:53 -07:00
Karl Kroening
4a70f6a868 Add get_video_thumbnail example 2018-06-02 01:04:39 -07:00
Karl Kroening
6274e7abf9 Add video_info example 2018-06-02 00:51:10 -07:00
Karl Kroening
e1dded89b1 Add read_frame_as_jpeg example 2018-06-02 00:42:51 -07:00
Karl Kroening
e294bd7753 Merge remote-tracking branch 'origin/master' 2018-06-02 00:33:58 -07:00
Karl Kroening
a01f68e8af
Merge pull request #88 from kkroening/output-video-size 
Support video_size output tuple
 2018-06-02 00:33:28 -07:00
Karl Kroening
3503f7301b Add ffmpeg-numpy.ipynb example 2018-06-02 00:32:59 -07:00
Karl Kroening
54db6e4272
Update README.md 2018-06-02 00:30:24 -07:00
Karl Kroening
c21e8c103f Support video_size output tuple 2018-06-02 00:25:47 -07:00
Karl Kroening
0ed77a30c7 #80: add video_bitrate and audio_bitrate params 2018-06-01 23:41:24 -07:00
Karl Kroening
593cd3e790 Release 0.1.12 0.1.12 2018-06-01 22:58:40 -07:00
Karl Kroening
e6fd3ff7c8
Merge pull request #85 from kkroening/inout 
Add input/output support in `run` command; update docs
 2018-05-20 01:46:58 -07:00
Karl Kroening
6a2d3381b7 Fix tests 2018-05-20 01:43:43 -07:00
Karl Kroening
9a487e8603 Fix exception params 2018-05-20 01:29:59 -07:00
Karl Kroening
940b05f3fc Fix ffprobe exception test 2018-05-20 01:21:30 -07:00
Karl Kroening
4558c25ced Update tox.ini 2018-05-20 01:17:54 -07:00
Karl Kroening
8711e16c2d Merge remote-tracking branch 'origin/master' into inout 2018-05-20 01:14:48 -07:00
Karl Kroening
57b8f9fa22 Pull docs from #85 2018-05-20 01:14:10 -07:00