From 8f3aef3e56caa9ba854191a68d7b0687a42bcc75 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 5 Oct 2010 01:46:21 -0700
Subject: [PATCH] Second attempt at commiting NoFFMPEG.

Conflicts:

	modules/noffmpeg/helpers/movie.php
---
 modules/noffmpeg/helpers/movie.php | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/modules/noffmpeg/helpers/movie.php b/modules/noffmpeg/helpers/movie.php
index 40d0940a..801796b8 100644
--- a/modules/noffmpeg/helpers/movie.php
+++ b/modules/noffmpeg/helpers/movie.php
@@ -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.
     }