summaryrefslogtreecommitdiff
path: root/modules/gallery/helpers/movie.php
diff options
context:
space:
mode:
authorshadlaws <shad@shadlaws.com>2013-01-24 12:03:05 +0100
committershadlaws <shad@shadlaws.com>2013-01-24 12:03:05 +0100
commit031dd3bd6f279b5ddec6f08ff11e0acee521a5fe (patch)
tree6e8988e28d0eff76214834d644c8438db5a11cba /modules/gallery/helpers/movie.php
parent3e451d6edc6ab3586ef730e4458ca0b2d55f5170 (diff)
#1960 - Add unit test to look for extra spaces at end of line
- Added no_extra_spaces_at_end_of_line_test to File_Structure_Test. - Updated Gallery_Filters to exclude testing code that isn't ours. - Removed existing extra spaces. New test now passes.
Diffstat (limited to 'modules/gallery/helpers/movie.php')
-rw-r--r--modules/gallery/helpers/movie.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php
index fb3fab80..7e6a2e55 100644
--- a/modules/gallery/helpers/movie.php
+++ b/modules/gallery/helpers/movie.php
@@ -82,7 +82,7 @@ class movie_Core {
// extract frame at start_time, unless movie is too short
$start_time_arg = ($duration >= $start_time + 0.1) ?
"-ss " . movie::seconds_to_hhmmssdd($start_time) : "";
-
+
$input_args = isset($movie_options["input_args"]) ? $movie_options["input_args"] : "";
$output_args = isset($movie_options["output_args"]) ? $movie_options["output_args"] : "";
@@ -164,7 +164,7 @@ class movie_Core {
* Return the time/duration formatted in hh:mm:ss.dd from a number of seconds.
* Useful for inputs to ffmpeg.
*
- * Note that this is similar to date("H:i:s", mktime(0,0,$seconds,0,0,0,0)), but unlike this
+ * Note that this is similar to date("H:i:s", mktime(0,0,$seconds,0,0,0,0)), but unlike this
* approach avoids potential issues with time zone and DST mismatch and/or using deprecated
* features (the last argument of mkdate above, which disables DST, is deprecated as of PHP 5.3).
*/
@@ -172,7 +172,7 @@ class movie_Core {
return sprintf("%02d:%02d:%05.2f", floor($seconds / 3600), floor(($seconds % 3600) / 60),
floor(100 * $seconds % 6000) / 100);
}
-
+
/**
* Return the number of seconds from a time/duration formatted in hh:mm:ss.dd.
* Useful for outputs from ffmpeg.