public/gallery3-contrib
Archived
1
0
Fork 0
Code Releases Activity

Second attempt at commiting NoFFMPEG.

Browse Source 
Conflicts:

	modules/noffmpeg/helpers/movie.php
This commit is contained in:
Bharat Mediratta 2010-10-05 01:46:21 -07:00
parent defb1ebdc1
commit 8f3aef3e56
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/noffmpeg/helpers/movie.php
View File

@ -23,9 +23,6 @@
*
* Note: by design, this class does not do any permission checking.
*/
include MODPATH . "noffmpeg/libraries/MP4Info.php";
class movie_Core {
static function get_edit_form($movie) {
$form = new Forge("movies/update/$movie->id", "", "post", array("id" => "g-edit-movie-form"));
@ -116,17 +113,7 @@ class movie_Core {
$extension = isset($pi["extension"]) ? $pi["extension"] : "flv"; // No extension? Assume FLV.
$mime_type = in_array(strtolower($extension), array("mp4", "m4v")) ?
"video/mp4" : "video/x-flv";
$vid_width = 320;
$vid_height = 240;
if (strtolower($extension) == "flv") {
$flvinfo = new FLVMetaData($file_path);
$info = $flvinfo->getMetaData();
if (($info["width"] != "") && ($info["height"] != "")) {
$vid_width = $info["width"];
$vid_height = $info["height"];
}
}
return array($vid_width, $vid_height, $mime_type, $extension);
return array(320, 240, $mime_type, $extension);
//throw new Exception("@todo MISSING_FFMPEG");
// END rWatcher Edit.
}