Gracefully Fix

oliverfriedmann · oliverfriedmann · commit 9ca896628ef0 · 2018-06-15T22:57:33.000+02:00
diff --git a/FfmpegVideoTranscoding.php b/FfmpegVideoTranscoding.php
@@ -300,10 +300,11 @@ private static function separateAudioVideoTranscodingRequired($source, $options)
 	}
 
     public static function transcodeGracefully($source, $options) {
-        if (self::separateAudioVideoTranscodingRequired($source, $options))
-            return self::transcodeAudioVideoSeparately($source, $options);
         try {
-            return self::transcode($source, $options);
+            if (self::separateAudioVideoTranscodingRequired($source, $options))
+                return self::transcodeAudioVideoSeparately($source, $options);
+            else
+                return self::transcode($source, $options);
         } catch (Exception $e) {
             return self::transcodeAudioVideoSeparately2($source, $options);
         }
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
 	"name" : "ziggeo/php-ffmpeg-toolkit",
 	"description" : "A php library for running ffmpeg.",
-	"version" : "0.0.11",
+	"version" : "0.0.12",
 	"license" : "Apache-2.0",
 	"require" : {
 		"php" : ">=5.3.0"

Original file line number	Diff line number	Diff line change
`@@ -300,10 +300,11 @@ private static function separateAudioVideoTranscodingRequired($source, $options)`
`300`	`300`	`}`
`301`	`301`
`302`	`302`	`public static function transcodeGracefully($source, $options) {`
`303`		`- if (self::separateAudioVideoTranscodingRequired($source, $options))`
`304`		`- return self::transcodeAudioVideoSeparately($source, $options);`
`305`	`303`	`try {`
`306`		`- return self::transcode($source, $options);`
	`304`	`+ if (self::separateAudioVideoTranscodingRequired($source, $options))`
	`305`	`+ return self::transcodeAudioVideoSeparately($source, $options);`
	`306`	`+ else`
	`307`	`+ return self::transcode($source, $options);`
`307`	`308`	`} catch (Exception $e) {`
`308`	`309`	`return self::transcodeAudioVideoSeparately2($source, $options);`
`309`	`310`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name" : "ziggeo/php-ffmpeg-toolkit",`
`3`	`3`	`"description" : "A php library for running ffmpeg.",`
`4`		`- "version" : "0.0.11",`
	`4`	`+ "version" : "0.0.12",`
`5`	`5`	`"license" : "Apache-2.0",`
`6`	`6`	`"require" : {`
`7`	`7`	`"php" : ">=5.3.0"`