From b4ef00c8d4e55fe7db3147da21cb4239fd3c428c Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Tue, 16 Jun 2009 19:44:15 -0700 Subject: [PATCH] Use a placeholder image if ffmpeg is missing instead of throwing an exception which would get silently swallowed by swfUpload. --- modules/gallery/helpers/graphics.php | 7 ++++++- modules/gallery/helpers/movie.php | 7 ++++++- modules/gallery/images/missing_movie.png | Bin 0 -> 11653 bytes 3 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 modules/gallery/images/missing_movie.png diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php index feebfb34..3f3317ae 100644 --- a/modules/gallery/helpers/graphics.php +++ b/modules/gallery/helpers/graphics.php @@ -135,7 +135,12 @@ class graphics_Core { if ($input_item->is_movie()) { // Convert the movie to a JPG first $output_file = preg_replace("/...$/", "jpg", $output_file); - movie::extract_frame($input_file, $output_file); + try { + movie::extract_frame($input_file, $output_file); + } catch (Exception $e) { + // Assuming this is MISSING_FFMPEG for now + copy(MODPATH . "gallery/images/missing_movie.png", $output_file); + } $working_file = $output_file; } else { $working_file = $input_file; diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php index 1d1d29d1..28c15d81 100644 --- a/modules/gallery/helpers/movie.php +++ b/modules/gallery/helpers/movie.php @@ -53,7 +53,12 @@ class movie_Core { throw new Exception("@todo NAME_CANNOT_END_IN_PERIOD"); } - $movie_info = movie::getmoviesize($filename); + try { + $movie_info = movie::getmoviesize($filename); + } catch (Exception $e) { + // Assuming this is MISSING_FFMPEG for now + $movie_info = getimagesize(MODPATH . "gallery/images/missing_movie.png"); + } // Force an extension onto the name $pi = pathinfo($filename); diff --git a/modules/gallery/images/missing_movie.png b/modules/gallery/images/missing_movie.png new file mode 100644 index 0000000000000000000000000000000000000000..71eb4ecfbbe8459068711ac836a005c6690cbda9 GIT binary patch literal 11653 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 Mo~X%}$eIWLFOH{!6#xJL literal 0 HcmV?d00001