Merge branch 'master' of git://github.com/gallery/gallery3

1 files changed, 2 insertions, 2 deletions

diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php
index 78358b6b..0895c5f4 100644
--- a/modules/gallery/helpers/movie.php
+++ b/modules/gallery/helpers/movie.php
@@ -58,7 +58,7 @@ class movie_Core {
   }
 
   static function extract_frame($input_file, $output_file) {
-    $ffmpeg = self::find_ffmpeg();
+    $ffmpeg = movie::find_ffmpeg();
     if (empty($ffmpeg)) {
       throw new Exception("@todo MISSING_FFMPEG");
     }
@@ -103,7 +103,7 @@ class movie_Core {
    * Return the width, height, mime_type and extension of the given movie file.
    */
   static function get_file_metadata($file_path) {
-    $ffmpeg = self::find_ffmpeg();
+    $ffmpeg = movie::find_ffmpeg();
     if (empty($ffmpeg)) {
       throw new Exception("@todo MISSING_FFMPEG");
     }