Fix eyecatchup#14 for windows platforms

bascoder · bascoder · commit b3b928a11cc8 · 2016-03-26T11:42:25.000+01:00
diff --git a/youtube-dl.class.php b/youtube-dl.class.php
@@ -659,8 +659,11 @@ private function valid_dir($dir)
      */
     private function has_ffmpeg()
     {
-        $sh = `which ffmpeg`;
-        return (bool) (strlen(trim($sh)) > 0);
+        // check if ffmpeg is installed using returnVariable on help command
+        $returnVar = false;
+        $out = array();
+        exec('ffmpeg -h', $out, $returnVar);
+        return $returnVar === 0;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -659,8 +659,11 @@ private function valid_dir($dir)`
`659`	`659`	`*/`
`660`	`660`	`private function has_ffmpeg()`
`661`	`661`	`{`
`662`		- $sh = `which ffmpeg`;
`663`		`- return (bool) (strlen(trim($sh)) > 0);`
	`662`	`+ // check if ffmpeg is installed using returnVariable on help command`
	`663`	`+ $returnVar = false;`
	`664`	`+ $out = array();`
	`665`	`+ exec('ffmpeg -h', $out, $returnVar);`
	`666`	`+ return $returnVar === 0;`
`664`	`667`	`}`
`665`	`668`
`666`	`669`	`/**`