diff options
author | Bharat Mediratta <bharat@menalto.com> | 2009-02-25 05:27:29 +0000 |
---|---|---|
committer | Bharat Mediratta <bharat@menalto.com> | 2009-02-25 05:27:29 +0000 |
commit | 515c081f794c0e020241956f291381361e28489a (patch) | |
tree | 3c1f4a153d046db9f3a4a39df4954bbc33a227f1 /modules | |
parent | 585ea819579405bbfe772d2e7fa647f54d5a17e2 (diff) |
Add support MP4 movies also. Flowplayer supports them and can stream
them using the h264streaming plugin. Everything else is a fairly
minor change.
Diffstat (limited to 'modules')
-rw-r--r-- | modules/local_import/controllers/local_import.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/local_import/controllers/local_import.php b/modules/local_import/controllers/local_import.php index 80dc0215..12f548fc 100644 --- a/modules/local_import/controllers/local_import.php +++ b/modules/local_import/controllers/local_import.php @@ -86,7 +86,7 @@ class Local_Import_Controller extends Controller { } else { $parent = $album; } - } else if ($pathinfo["extension"] == "flv") { + } else if (in_array($pathinfo["extension"], array("flv", "mp4")) { $movie = movie::create($parent, $source_path, basename($source_path), basename($source_path)); log::success("content", t("Added a movie"), @@ -115,7 +115,7 @@ class Local_Import_Controller extends Controller { $extension = strtolower(substr(strrchr($file, '.'), 1)); // Make sure the file is readable if (is_readable($full_path) && - in_array($extension, array("IMAGETYPE_GIF", "JPEG", "jpg", "PNG", "flv"))) { + in_array($extension, array("gif", "jpeg", "jpg", "png", "flv", "mp4"))) { $file_list[$file] = array("path" => $full_path, "is_dir" => false); } } |