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

37 Commits

Author SHA1 Message Date
Richard Meyers
33c9d53678
Added output arg for video codec 
In order to enable hardware acceleration for ffmpeg-python the arg -c:v needs to be used. This change adds that capability using the same method as video_bitrate.
 2018-07-08 20:08:08 -07: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
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
9a487e8603 Fix exception params 2018-05-20 01:29:59 -07:00
Karl Kroening
ac57e2df13 Add input/output support in run command; update docs 2018-05-20 01:13:07 -07:00
Karl Kroening
84355d419c #30: re-futurize 2018-05-09 03:15:12 -05:00
Karl Kroening
3e68bc8c9a #30: add global_args operator 2018-05-09 03:09:21 -05:00
Karl Kroening
6169b89321 Minor improvements (formatting, etc) 2018-03-11 20:03:06 -07:00
Davide Depau
ef9b102676
Merge branch 'master' into stream_selectors 2018-01-12 21:55:38 +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
Davide Depau
1a46471553
Remove useless _get_stream_name function 2018-01-09 15:47:09 +01:00
Davide Depau
03762a5cc5
Expand complicated format + list comprehension into its own function 2018-01-09 15:47:09 +01:00
Davide Depau
90652306ea
Explicitly include -map [0] when output has multiple mapped streams 2018-01-09 15:47:08 +01:00
Davide Depau
aa0b0bbd03
Generate multiple -map for outputs with multiple incoming edges 2018-01-09 15:47:08 +01:00
Davide Depau
3f671218a6
Take into account upstream selectors in topological sort, get_args() and view() 2018-01-09 15:47:08 +01:00
Karl Kroening
338a1286f7 Fix issue with start_time=0 2018-01-07 23:26:53 -08:00
Karl Kroening
f818cffc55 Add compile operator 2018-01-07 02:28:13 -08:00
Karl Kroening
4640adabe0 Futurize 2017-07-12 02:10:44 -06:00
Karl Kroening
cf1b7bfd4b #17: auto-generate split output count 2017-07-10 23:38:30 -06:00
Karl Kroening
5d78a2595d #17: fix merge_outputs; allow stream_spec in get_args+run 2017-07-09 15:50:51 -06:00
Karl Kroening
8337d34b82 #17: add proper handling of split operator 2017-07-06 03:35:20 -06:00
Karl Kroening
6887ad8bac Massive refactor to break nodes into streams+nodes 2017-07-06 02:23:13 -06:00
Karl Kroening
fc07f6c4fa #17: remove Node._parents 2017-07-05 04:07:30 -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
6a9a12e718 #17: move graph stuff to dag.py; add edge labelling 2017-07-05 03:13:30 -06:00
Davide Depau
086613bb09 convert assertions to if+raise 2017-06-30 15:54:09 +02:00
Karl Kroening
525b1bf452 Make input/output cmd-line args deterministically sorted 2017-06-14 02:25:58 -06:00
Karl Kroening
03f99dbba0 Support input/output parameters 2017-06-14 02:07:23 -06:00
Karl Kroening
cd3d3715b8 Support python3 2017-06-13 19:37:14 -06:00
Karl Kroening
8ff9f408c6 Rename file_{input,output} to {input,output} 2017-05-27 17:53:02 -10:00
Karl Kroening
cfe2995bac #1: add tests for ffmpeg.run with cmd list 2017-05-27 17:31:17 -10:00
Karl Kroening
a51cfe7f1c Merge remote-tracking branch 'origin/feature-1' into feature-1 2017-05-27 17:26:45 -10:00
Karl Kroening
98d77a5261 #1: make linter happy 2017-05-27 17:26:34 -10:00
Karl Kroening
0647c68aff Merge remote-tracking branch 'origin/feature-1' into HEAD 
Conflicts:
	ffmpeg/__init__.py
 2017-05-27 17:22:14 -10:00
Karl Kroening
8d142c5fa9 #1: update docs 2017-05-27 17:16:59 -10:00
Karl Kroening
696e52a989 #1: split operators into modules 2017-05-27 15:43:22 -10:00