Merge pull request #6 from Ziggeo/patch

iglesiaspablo · web-flow · commit d810475fe9e5 · 2023-03-08T16:51:36.000-03:00
Prevent error on logging
diff --git a/FfmpegVideoTranscoding.php b/FfmpegVideoTranscoding.php
@@ -173,7 +173,7 @@ public static function transcode($source, $options) {
         } catch (Exception $e) {
             throw new VideoTranscodingException(VideoTranscodingException::TRANSCODE_EXCEPTION, (string)$e);
         } finally {
-						if (@$options["log"])
+						if (@$options["log"] && @$video)
 								print_r(implode(PHP_EOL, $video->getFinalCommand($format, $target)) . PHP_EOL);
         }
         if (@$options["faststart"] && $options["format"] == "mp4")
@@ -237,7 +237,7 @@ public static function extractAudio($source, $format, $options = array()) {
         } catch (Exception $e) {
             throw new VideoTranscodingException(VideoTranscodingException::TRANSCODE_EXCEPTION, (string)$e);
         } finally {
-	          if (@$options["log"])
+	          if (@$options["log"] && @$video)
 		            print_r(implode(PHP_EOL, $video->getFinalCommand($format, $target)) . PHP_EOL);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ public static function transcode($source, $options) {`
`173`	`173`	`} catch (Exception $e) {`
`174`	`174`	`throw new VideoTranscodingException(VideoTranscodingException::TRANSCODE_EXCEPTION, (string)$e);`
`175`	`175`	`} finally {`
`176`		`- if (@$options["log"])`
	`176`	`+ if (@$options["log"] && @$video)`
`177`	`177`	`print_r(implode(PHP_EOL, $video->getFinalCommand($format, $target)) . PHP_EOL);`
`178`	`178`	`}`
`179`	`179`	`if (@$options["faststart"] && $options["format"] == "mp4")`
`@@ -237,7 +237,7 @@ public static function extractAudio($source, $format, $options = array()) {`
`237`	`237`	`} catch (Exception $e) {`
`238`	`238`	`throw new VideoTranscodingException(VideoTranscodingException::TRANSCODE_EXCEPTION, (string)$e);`
`239`	`239`	`} finally {`
`240`		`- if (@$options["log"])`
	`240`	`+ if (@$options["log"] && @$video)`
`241`	`241`	`print_r(implode(PHP_EOL, $video->getFinalCommand($format, $target)) . PHP_EOL);`
`242`	`242`	`}`
`243`	`243`	`}`