Skip to content

Commit

Permalink
Merge pull request #110 from shmurakami/master
Browse files Browse the repository at this point in the history
Inherit user config to parser
  • Loading branch information
buggedcom authored Sep 7, 2017
2 parents 3dc1e0c + df86fab commit 383a5b2
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ vendor
*.sql.gz
examples/output/*
examples/tmp/*
/.idea/
.idea
6 changes: 0 additions & 6 deletions .idea/vcs.xml

This file was deleted.

2 changes: 1 addition & 1 deletion src/PHPVideoToolkit/Format.php
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ public function __construct($input_output_type=Format::OUTPUT, Config $config=nu
'threads_indexed' => null,
);

$ffmpeg = new FfmpegParser();
$ffmpeg = new FfmpegParser($config);
$available_commands = $ffmpeg->getCommands();
if(isset($available_commands['crf']))
{
Expand Down

0 comments on commit 383a5b2

Please sign in to comment.