Merge pull request #110 from shmurakami/master

buggedcom · web-flow · commit 383a5b2c0ee7 · 2017-09-07T11:36:56.000+03:00
Inherit user config to parser
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,4 @@ vendor
 *.sql.gz
 examples/output/*
 examples/tmp/*
-/.idea/
+.idea
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/src/PHPVideoToolkit/Format.php b/src/PHPVideoToolkit/Format.php
@@ -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']))
             {

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ public function __construct($input_output_type=Format::OUTPUT, Config $config=nu`
`118`	`118`	`'threads_indexed' => null,`
`119`	`119`	`);`
`120`	`120`
`121`		`- $ffmpeg = new FfmpegParser();`
	`121`	`+ $ffmpeg = new FfmpegParser($config);`
`122`	`122`	`$available_commands = $ffmpeg->getCommands();`
`123`	`123`	`if(isset($available_commands['crf']))`
`124`	`124`	`{`