Creating presets which can be exported with features, chostools and move subsidary module to modules directory

9 files changed, 0 insertions, 2190 deletions

diff --git a/plugins/video_zencoder/includes/LICENSE b/plugins/video_zencoder/includes/LICENSE
deleted file mode 100644
index d1f0a51..0000000
--- a/plugins/video_zencoder/includes/LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2010 Zencoder
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/plugins/video_zencoder/includes/README.markdown b/plugins/video_zencoder/includes/README.markdown
deleted file mode 100644
index 0be2256..0000000
--- a/plugins/video_zencoder/includes/README.markdown
+++ /dev/null
@@ -1,199 +0,0 @@
-Zencoder API PHP Library
-==========================
-
-Author:  [Steve Heffernan](http://www.steveheffernan.com) (steve (a) zencoder (.) com)  
-Company: [Zencoder - Online Video Encoder](http://zencoder.com)  
-Version: 1.1  
-Date:    2010-06-04  
-Repository: <http://github.com/zencoder/zencoder-php/>  
-
-For more details on the Zencoder API requirements visit  
-<http://zencoder.com/docs/api>
-
-
-ENCODING JOB
-------------
-The ZencoderJob object creates an encoding job using [cURL](http://zencoder.com/docs/glossary/curl/)
-to send [JSON](http://zencoder.com/docs/glossary/json/) formatted parameters to Zencoder's encoding API.
-
-### Step 1
-Visit the [API builder](https://app.zencoder.com/api_builder) in your account,
-and execute a successful encoding job.
-
-### Step 2
-Copy the successful JSON string, starting with the first curly brace "{",
-and pass it as the parameters for a new ZencoderJob object. Execute the script on your server to test that it works.
-
-#### Example
-    <pre>
-    <?php
-
-    // Make sure this points to a copy of Zencoder.php on the same server as this script.
-    require_once("zencoder-php/Zencoder.php");
-
-    // New Encoding Job
-    $encoding_job = new ZencoderJob('
-      {
-        "api_key": "93h630j1dsyshjef620qlkavnmzui3",
-        "input": "s3://bucket-name/file-name.avi"
-        "outputs": [
-          {
-            "label": "web"
-          }
-        ]
-      }
-    ');
-
-    // Check if it worked
-    if ($encoding_job->created) {
-      // Success
-      echo "w00t! \n\n";
-      echo "Job ID: ".$encoding_job->id."\n";
-      echo "Output '".$encoding_job->outputs["web"]->label."' ID: ".$encoding_job->outputs["web"]->id."\n";
-      // Store Job/Output IDs to update their status when notified or to check their progress.
-    } else {
-      // Failed
-      echo "Fail :(\n\n";
-      echo "Errors:\n";
-      foreach($encoding_job->errors as $error) {
-        echo $error."\n";
-      }
-    }
-
-    echo "\nAll Job Attributes:\n";
-    var_dump($encoding_job);
-
-    ?>
-    </pre>
-
-### Step 3
-Modify the above script to meet your needs.  
-Your [API Request History](https://app.zencoder.com/api_requests) may come in handy.  
-You can revisit your [API builder](https://app.zencoder.com/api_builder) to add/update parameters of the JSON.  
-
-You can translate the JSON string into nested associative arrays so that you can dynamically change attributes like "input".  
-The previous JSON example would become:
-
-    $encoding_job = new ZencoderJob(array(
-      "api_key" => "93h630j1dsyshjef620qlkavnmzui3",
-      "input" => "s3://bucket-name/file-name.avi",
-      "outputs" => array(
-        array(
-          "label" => "web"
-        )
-      )
-    ));
-
-
-GENERAL API REQUESTS
---------------------
-A general API request can be used for all API functionality including **Job Listing**, **Job Details**, **Account Creation**, **Account Details** (even Job Creation if desired). See the [API docs](http://zencoder.com/docs/api/) for all possible API requests.
-The first argument is the **API URL**.  
-The second argument is your **API Key**.  
-The third argument is the **request parameters** if needed. It can either be a JSON string or an array of parameters.
-
-
-#### Example Job List Request
-
-    $request = new ZencoderRequest(
-      'https://app.zencoder/api/jobs',
-      '93h630j1dsyshjef620qlkavnmzui3'
-    );
-
-    if ($request->successful) {
-      print_r($request->results);
-    } else {
-      foreach($request->errors as $error) {
-        echo $error."\n";
-      }
-    }
-
-#### Example Account Creation Request
-
-    $request = new ZencoderRequest(
-      'https://app.zencoder/api/account', 
-      false, // API key isn't needed for new account creation
-      array(
-        "terms_of_service" => "1",
-        "email" => "test@example.com",
-        "password" => "1234"
-      )
-    );
-
-    if ($request->successful) {
-      print_r($request->results);
-    } else {
-      foreach($request->errors as $error) {
-        echo $error."\n";
-      }
-    }
-
-
-NOTIFICATION HANDLING
-----------------------
-The ZencoderOutputNotification class is used to capture and parse JSON data sent from
-Zencoder to your app when an output file has been completed.
-
-
-
-### Step 1
-Create a script to receive notifications, and upload it to a location on your server that is publicly accessible.
-
-#### Example
-    <?php
-
-    // Make sure this points to a copy of Zencoder.php on the same server as this script.
-    require("Zencoder.php");
-
-    // Catch notification
-    $notification = ZencoderOutputNotification::catch_and_parse();
-
-    // Check output/job state
-    if($notification->output->state == "finished") {
-      echo "w00t!\n";
-
-      // If you're encoding to multiple outputs and only care when all of the outputs are finished
-      // you can check if the entire job is finished.
-      if($notification->job->state == "finished") {
-        echo "Dubble w00t!";
-      }
-    } elseif ($notification->output->state == "cancelled") {
-      echo "Cancelled!\n";
-    } else {
-      echo "Fail!\n";
-      echo $notification->output->error_message."\n";
-      echo $notification->output->error_link;
-    }
-
-    ?>
-
-### Step 2
-In the parameters for an encoding job, add the URL for your script to the notifications array of each output you want to be notified for. 
-Then submit the job to test if it works.  
-
-**You can view the results at:**  
-<https://app.zencoder.com/notifications>
-
-#### Example
-    ...
-    "outputs" => array(
-      array(
-        "label" => "web",
-        "notifications" => array("http://example.com.com/encoding/notification.php")
-      ),
-      array(
-        "label" => "iPhone",
-        "notifications" => array("http://example.com.com/encoding/notification.php")
-      )
-    )
-    ...
-
-
-### Step 3
-Modify the above script to meet your needs.  
-Your [notifications page](https://app.zencoder.com/notifications) will come in handy.
-
-VERSIONS
----------
-    Version 1.1 - 2010-06-04    Added General API Requests
-    Version 1.0 - 2010-04-02    Jobs and Notifications.
\ No newline at end of file
diff --git a/plugins/video_zencoder/includes/Zencoder.php b/plugins/video_zencoder/includes/Zencoder.php
deleted file mode 100644
index 4ff0db7..0000000
--- a/plugins/video_zencoder/includes/Zencoder.php
+++ /dev/null
@@ -1,240 +0,0 @@
-<?php
-/*
-
-  Zencoder API PHP Library
-  Version: 1.0
-  See the README file for info on how to use this library.
-
-*/
-define('ZENCODER_LIBRARY_NAME',  "ZencoderPHP");
-define('ZENCODER_LIBRARY_VERSION',  "1.0");
-
-// Add JSON functions for PHP < 5.2.0
-if(!function_exists('json_encode')) {
-  require_once('lib/JSON.php');
-  $GLOBALS['JSON_OBJECT'] = new Services_JSON(SERVICES_JSON_LOOSE_TYPE);
-  function json_encode($value) { return $GLOBALS['JSON_OBJECT']->encode($value); }
-  function json_decode($value) { return $GLOBALS['JSON_OBJECT']->decode($value); }
-}
-
-class ZencoderJob {
-
-  var $new_job_url = "https://app.zencoder.com/api/jobs"; //https://app.zencoder.com/api/jobs
-  //https://zencoder-staging.heroku.com/api/jobs
-  var $new_job_params = array();
-  var $new_job_json;
-  var $created = false;
-  var $errors = array();
-
-  // Attributes
-  var $id;
-  var $outputs = array();
-
-  // Initialize
-  function ZencoderJob($params, $options = array()) {
-
-    // Build using params if not sending request
-    if($options["build"]) {
-      $this->update_attributes($params);
-      return true;
-    }
-
-    $this->new_job_params = $params;
-    $this->created = $this->create();
-  }
-
-  // Send Job Request to API
-  function create() {
-    // Send request
-    $request = new ZencoderRequest($this->new_job_url, false, $this->new_job_params);
-
-    if($request->successful) {
-      $this->update_attributes($request->results);
-      return true;
-    } else {
-      $this->errors = array_merge($this->errors, $request->errors);
-      return false;
-    }
-  }
-
-  // Add/Update attributes on the job object.
-  function update_attributes($attributes = array()) {
-    foreach($attributes as $attr_name => $attr_value) {
-      // Create output file objects
-      if($attr_name == "outputs" && is_array($attr_value)) {
-        $this->create_outputs($attr_value);
-      } elseif (!function_exists($this->$attr_name)) {
-        $this->$attr_name = $attr_value;
-      }
-    }
-  }
-
-  // Create output file objects from returned parameters.
-  // Use the Label for the key if avaiable.
-  function create_outputs($outputs = array()) {
-    foreach($outputs as $output_attrs) {
-      if($output_attrs["label"]) {
-        $this->outputs[$output_attrs["label"]] = new ZencoderOutputFile($output_attrs);
-      } else {
-        $this->outputs[] = new ZencoderOutputFile($output_attrs);
-      }
-    }
-  }
-}
-
-class ZencoderOutputFile {
-
-  var $id;
-  var $label;
-  var $url;
-  var $state;
-  var $error_message;
-  var $error_link;
-
-  function ZencoderOutputFile($attributes = array()) {
-    $this->update_attributes($attributes);
-  }
-
-  // Add/Update attributes on the file object.
-  function update_attributes($attributes = array()) {
-    foreach($attributes as $attr_name => $attr_value) {
-      if(!function_exists($this->$attr_name)) {
-        $this->$attr_name = $attr_value;
-      }
-    }
-  }
-}
-
-// General API request class
-class ZencoderRequest {
-
-  var $successful = false;
-  var $errors = array();
-  var $raw_results;
-  var $results;
-
-  function ZencoderRequest($url, $api_key = "", $params = "") {
-
-    // Add api_key to url if supplied
-    if($api_key) {
-      $url .= "?api_key=".$api_key;
-    }
-
-    // Get JSON
-    if(is_string($params)) {
-      $json = trim($params);
-    } else if(is_array($params)) {
-      $json = json_encode($params);
-    } else {
-      $json = false;
-    }
-
-    // Create request
-    $request = new ZencoderCURL($url, $json);
-
-    // Check for connection errors
-    if ($request->connected == false) {
-      $this->errors[] = $request->error;
-      return;
-    }
-
-    $status_code = intval($request->status_code);
-    $this->raw_results = $request->results;
-
-    // Parse returned JSON
-    $this->results = json_decode($this->raw_results, true);
-
-    // Return based on HTTP status code
-    if($status_code >= 200 && $status_code <= 206) {
-      $this->successful = true;
-    } else {
-      // Get job request errors if any
-      if(is_array($this->results["errors"])) {
-        foreach($this->results["errors"] as $error) {
-          $this->errors[] = $error;
-        }
-      } else {
-        $this->errors[] = "Unknown Error\n\nHTTP Status Code: ".$request->status_code."\n"."Raw Results: \n".$request->raw_results;
-      }
-    }
-  }
-}
-
-// ZencoderCURL
-// The connection class to perform the actual request to the surver
-// using cURL http://php.net/manual/en/book.curl.php
-class ZencoderCURL {
-
-  var $options = array(
-    CURLOPT_RETURNTRANSFER => 1, // Return content of the url
-    CURLOPT_HEADER => 0, // Don't return the header in result
-    CURLOPT_HTTPHEADER => array("Content-Type: application/json", "Accept: application/json"),
-    CURLOPT_CONNECTTIMEOUT => 0, // Time in seconds to timeout send request. 0 is no timeout.
-    CURLOPT_FOLLOWLOCATION => 1, // Follow redirects.
-  );
-
-  var $connected;
-  var $results;
-  var $status_code;
-  var $error;
-
-  // Initialize
-  function ZencoderCURL($url, $json, $options = array()) {
-
-    // Add library details to request
-    $this->options[CURLOPT_HTTPHEADER][] = "Zencoder-Library-Name: ".ZENCODER_LIBRARY_NAME;
-    $this->options[CURLOPT_HTTPHEADER][] = "Zencoder-Library-Version: ".ZENCODER_LIBRARY_VERSION;
-
-    // If posting data
-    if($json) {
-      $this->options[CURLOPT_POST] = 1;
-      $this->options[CURLOPT_POSTFIELDS] = $json;
-    }
-
-    // Add cURL options to defaults (can't use array_merge)
-    foreach($options as $option_key => $option) {
-      $this->options[$option_key] = $option;
-    }
-
-    // Initialize session
-    $ch = curl_init($url);
-
-    // Set transfer options
-    curl_setopt_array($ch, $this->options);
-    curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);
-
-    // Execute session and store returned results
-    $this->results = curl_exec($ch);
-
-    // Store the HTTP status code given (201, 404, etc.)
-    $this->status_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-
-    // Check for cURL error
-    if (curl_errno($ch)) {
-      $this->error = 'cURL connection error ('.curl_errno($ch).'): '.htmlspecialchars(curl_error($ch)).' <a href="http://www.google.com/search?q='.urlencode("curl error ".curl_error($ch)).'">Search</a>';
-      $this->connected = false;
-    } else {
-      $this->connected = true;
-    }
-
-    // Close session
-    curl_close($ch);
-  }
-}
-
-// Capture incoming notifications from Zencoder to your app
-class ZencoderOutputNotification {
-
-  var $output;
-  var $job;
-
-  function ZencoderOutputNotification($params) {
-    if($params["output"]) $this->output = new ZencoderOutputFile($params["output"]);
-    if($params["job"]) $this->job = new ZencoderJob($params["job"], array("build" => true));
-  }
-
-  function catch_and_parse() {
-    $notificiation_data = json_decode(trim(file_get_contents('php://input')), true);
-    return new ZencoderOutputNotification($notificiation_data);
-  }
-}
diff --git a/plugins/video_zencoder/includes/lib/JSON.php b/plugins/video_zencoder/includes/lib/JSON.php
deleted file mode 100644
index f36a203..0000000
--- a/plugins/video_zencoder/includes/lib/JSON.php
+++ /dev/null
@@ -1,805 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * Converts to and from JSON format.
- *
- * JSON (JavaScript Object Notation) is a lightweight data-interchange
- * format. It is easy for humans to read and write. It is easy for machines
- * to parse and generate. It is based on a subset of the JavaScript
- * Programming Language, Standard ECMA-262 3rd Edition - December 1999.
- * This feature can also be found in  Python. JSON is a text format that is
- * completely language independent but uses conventions that are familiar
- * to programmers of the C-family of languages, including C, C++, C#, Java,
- * JavaScript, Perl, TCL, and many others. These properties make JSON an
- * ideal data-interchange language.
- *
- * This package provides a simple encoder and decoder for JSON notation. It
- * is intended for use with client-side Javascript applications that make
- * use of HTTPRequest to perform server communication functions - data can
- * be encoded into JSON notation for use in a client-side javascript, or
- * decoded from incoming Javascript requests. JSON format is native to
- * Javascript, and can be directly eval()'ed with no further parsing
- * overhead
- *
- * All strings should be in ASCII or UTF-8 format!
- *
- * LICENSE: Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met: Redistributions of source code must retain the
- * above copyright notice, this list of conditions and the following
- * disclaimer. Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
- * NO EVENT SHALL CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
- * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- * @category
- * @package     Services_JSON
- * @author      Michal Migurski <mike-json@teczno.com>
- * @author      Matt Knapp <mdknapp[at]gmail[dot]com>
- * @author      Brett Stimmerman <brettstimmerman[at]gmail[dot]com>
- * @copyright   2005 Michal Migurski
- * @license     http://www.opensource.org/licenses/bsd-license.php
- * @link        http://pear.php.net/pepr/pepr-proposal-show.php?id=198
- */
-
-/**
- * Marker constant for Services_JSON::decode(), used to flag stack state
- */
-define('SERVICES_JSON_SLICE',   1);
-
-/**
- * Marker constant for Services_JSON::decode(), used to flag stack state
- */
-define('SERVICES_JSON_IN_STR',  2);
-
-/**
- * Marker constant for Services_JSON::decode(), used to flag stack state
- */
-define('SERVICES_JSON_IN_ARR',  3);
-
-/**
- * Marker constant for Services_JSON::decode(), used to flag stack state
- */
-define('SERVICES_JSON_IN_OBJ',  4);
-
-/**
- * Marker constant for Services_JSON::decode(), used to flag stack state
- */
-define('SERVICES_JSON_IN_CMT', 5);
-
-/**
- * Behavior switch for Services_JSON::decode()
- */
-define('SERVICES_JSON_LOOSE_TYPE', 16);
-
-/**
- * Behavior switch for Services_JSON::decode()
- */
-define('SERVICES_JSON_SUPPRESS_ERRORS', 32);
-
-/**
- * Converts to and from JSON format.
- *
- * Brief example of use:
- *
- * <code>
- * // create a new instance of Services_JSON
- * $json = new Services_JSON();
- *
- * // convert a complexe value to JSON notation, and send it to the browser
- * $value = array('foo', 'bar', array(1, 2, 'baz'), array(3, array(4)));
- * $output = $json->encode($value);
- *
- * print($output);
- * // prints: ["foo","bar",[1,2,"baz"],[3,[4]]]
- *
- * // accept incoming POST data, assumed to be in JSON notation
- * $input = file_get_contents('php://input', 1000000);
- * $value = $json->decode($input);
- * </code>
- */
-class Services_JSON
-{
-   /**
-    * constructs a new JSON instance
-    *
-    * @param    int     $use    object behavior flags; combine with boolean-OR
-    *
-    *                           possible values:
-    *                           - SERVICES_JSON_LOOSE_TYPE:  loose typing.
-    *                                   "{...}" syntax creates associative arrays
-    *                                   instead of objects in decode().
-    *                           - SERVICES_JSON_SUPPRESS_ERRORS:  error suppression.
-    *                                   Values which can't be encoded (e.g. resources)
-    *                                   appear as NULL instead of throwing errors.
-    *                                   By default, a deeply-nested resource will
-    *                                   bubble up with an error, so all return values
-    *                                   from encode() should be checked with isError()
-    */
-    function Services_JSON($use = 0)
-    {
-        $this->use = $use;
-    }
-
-   /**
-    * convert a string from one UTF-16 char to one UTF-8 char
-    *
-    * Normally should be handled by mb_convert_encoding, but
-    * provides a slower PHP-only method for installations
-    * that lack the multibye string extension.
-    *
-    * @param    string  $utf16  UTF-16 character
-    * @return   string  UTF-8 character
-    * @access   private
-    */
-    function utf162utf8($utf16)
-    {
-        // oh please oh please oh please oh please oh please
-        if(function_exists('mb_convert_encoding')) {
-            return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16');
-        }
-
-        $bytes = (ord($utf16{0}) << 8) | ord($utf16{1});
-
-        switch(true) {
-            case ((0x7F & $bytes) == $bytes):
-                // this case should never be reached, because we are in ASCII range
-                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0x7F & $bytes);
-
-            case (0x07FF & $bytes) == $bytes:
-                // return a 2-byte UTF-8 character
-                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0xC0 | (($bytes >> 6) & 0x1F))
-                     . chr(0x80 | ($bytes & 0x3F));
-
-            case (0xFFFF & $bytes) == $bytes:
-                // return a 3-byte UTF-8 character
-                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0xE0 | (($bytes >> 12) & 0x0F))
-                     . chr(0x80 | (($bytes >> 6) & 0x3F))
-                     . chr(0x80 | ($bytes & 0x3F));
-        }
-
-        // ignoring UTF-32 for now, sorry
-        return '';
-    }
-
-   /**
-    * convert a string from one UTF-8 char to one UTF-16 char
-    *
-    * Normally should be handled by mb_convert_encoding, but
-    * provides a slower PHP-only method for installations
-    * that lack the multibye string extension.
-    *
-    * @param    string  $utf8   UTF-8 character
-    * @return   string  UTF-16 character
-    * @access   private
-    */
-    function utf82utf16($utf8)
-    {
-        // oh please oh please oh please oh please oh please
-        if(function_exists('mb_convert_encoding')) {
-            return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
-        }
-
-        switch(strlen($utf8)) {
-            case 1:
-                // this case should never be reached, because we are in ASCII range
-                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return $utf8;
-
-            case 2:
-                // return a UTF-16 character from a 2-byte UTF-8 char
-                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0x07 & (ord($utf8{0}) >> 2))
-                     . chr((0xC0 & (ord($utf8{0}) << 6))
-                         | (0x3F & ord($utf8{1})));
-
-            case 3:
-                // return a UTF-16 character from a 3-byte UTF-8 char
-                // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr((0xF0 & (ord($utf8{0}) << 4))
-                         | (0x0F & (ord($utf8{1}) >> 2)))
-                     . chr((0xC0 & (ord($utf8{1}) << 6))
-                         | (0x7F & ord($utf8{2})));
-        }
-
-        // ignoring UTF-32 for now, sorry
-        return '';
-    }
-
-   /**
-    * encodes an arbitrary variable into JSON format
-    *
-    * @param    mixed   $var    any number, boolean, string, array, or object to be encoded.
-    *                           see argument 1 to Services_JSON() above for array-parsing behavior.
-    *                           if var is a strng, note that encode() always expects it
-    *                           to be in ASCII or UTF-8 format!
-    *
-    * @return   mixed   JSON string representation of input var or an error if a problem occurs
-    * @access   public
-    */
-    function encode($var)
-    {
-        switch (gettype($var)) {
-            case 'boolean':
-                return $var ? 'true' : 'false';
-
-            case 'NULL':
-                return 'null';
-
-            case 'integer':
-                return (int) $var;
-
-            case 'double':
-            case 'float':
-                return (float) $var;
-
-            case 'string':
-                // STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT
-                $ascii = '';
-                $strlen_var = strlen($var);
-
-               /*
-                * Iterate over every character in the string,
-                * escaping with a slash or encoding to UTF-8 where necessary
-                */
-                for ($c = 0; $c < $strlen_var; ++$c) {
-
-                    $ord_var_c = ord($var{$c});
-
-                    switch (true) {
-                        case $ord_var_c == 0x08:
-                            $ascii .= '\b';
-                            break;
-                        case $ord_var_c == 0x09:
-                            $ascii .= '\t';
-                            break;
-                        case $ord_var_c == 0x0A:
-                            $ascii .= '\n';
-                            break;
-                        case $ord_var_c == 0x0C:
-                            $ascii .= '\f';
-                            break;
-                        case $ord_var_c == 0x0D:
-                            $ascii .= '\r';
-                            break;
-
-                        case $ord_var_c == 0x22:
-                        case $ord_var_c == 0x2F:
-                        case $ord_var_c == 0x5C:
-                            // double quote, slash, slosh
-                            $ascii .= '\\'.$var{$c};
-                            break;
-
-                        case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
-                            // characters U-00000000 - U-0000007F (same as ASCII)
-                            $ascii .= $var{$c};
-                            break;
-
-                        case (($ord_var_c & 0xE0) == 0xC0):
-                            // characters U-00000080 - U-000007FF, mask 110XXXXX
-                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char = pack('C*', $ord_var_c, ord($var{$c + 1}));
-                            $c += 1;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-
-                        case (($ord_var_c & 0xF0) == 0xE0):
-                            // characters U-00000800 - U-0000FFFF, mask 1110XXXX
-                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char = pack('C*', $ord_var_c,
-                                         ord($var{$c + 1}),
-                                         ord($var{$c + 2}));
-                            $c += 2;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-
-                        case (($ord_var_c & 0xF8) == 0xF0):
-                            // characters U-00010000 - U-001FFFFF, mask 11110XXX
-                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char = pack('C*', $ord_var_c,
-                                         ord($var{$c + 1}),
-                                         ord($var{$c + 2}),
-                                         ord($var{$c + 3}));
-                            $c += 3;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-
-                        case (($ord_var_c & 0xFC) == 0xF8):
-                            // characters U-00200000 - U-03FFFFFF, mask 111110XX
-                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char = pack('C*', $ord_var_c,
-                                         ord($var{$c + 1}),
-                                         ord($var{$c + 2}),
-                                         ord($var{$c + 3}),
-                                         ord($var{$c + 4}));
-                            $c += 4;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-
-                        case (($ord_var_c & 0xFE) == 0xFC):
-                            // characters U-04000000 - U-7FFFFFFF, mask 1111110X
-                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char = pack('C*', $ord_var_c,
-                                         ord($var{$c + 1}),
-                                         ord($var{$c + 2}),
-                                         ord($var{$c + 3}),
-                                         ord($var{$c + 4}),
-                                         ord($var{$c + 5}));
-                            $c += 5;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-                    }
-                }
-
-                return '"'.$ascii.'"';
-
-            case 'array':
-               /*
-                * As per JSON spec if any array key is not an integer
-                * we must treat the the whole array as an object. We
-                * also try to catch a sparsely populated associative
-                * array with numeric keys here because some JS engines
-                * will create an array with empty indexes up to
-                * max_index which can cause memory issues and because
-                * the keys, which may be relevant, will be remapped
-                * otherwise.
-                *
-                * As per the ECMA and JSON specification an object may
-                * have any string as a property. Unfortunately due to
-                * a hole in the ECMA specification if the key is a
-                * ECMA reserved word or starts with a digit the
-                * parameter is only accessible using ECMAScript's
-                * bracket notation.
-                */
-
-                // treat as a JSON object
-                if (is_array($var) && count($var) && (array_keys($var) !== range(0, sizeof($var) - 1))) {
-                    $properties = array_map(array($this, 'name_value'),
-                                            array_keys($var),
-                                            array_values($var));
-
-                    foreach($properties as $property) {
-                        if(Services_JSON::isError($property)) {
-                            return $property;
-                        }
-                    }
-
-                    return '{' . join(',', $properties) . '}';
-                }
-
-                // treat it like a regular array
-                $elements = array_map(array($this, 'encode'), $var);
-
-                foreach($elements as $element) {
-                    if(Services_JSON::isError($element)) {
-                        return $element;
-                    }
-                }
-
-                return '[' . join(',', $elements) . ']';
-
-            case 'object':
-                $vars = get_object_vars($var);
-
-                $properties = array_map(array($this, 'name_value'),
-                                        array_keys($vars),
-                                        array_values($vars));
-
-                foreach($properties as $property) {
-                    if(Services_JSON::isError($property)) {
-                        return $property;
-                    }
-                }
-
-                return '{' . join(',', $properties) . '}';
-
-            default:
-                return ($this->use & SERVICES_JSON_SUPPRESS_ERRORS)
-                    ? 'null'
-                    : new Services_JSON_Error(gettype($var)." can not be encoded as JSON string");
-        }
-    }
-
-   /**
-    * array-walking function for use in generating JSON-formatted name-value pairs
-    *
-    * @param    string  $name   name of key to use
-    * @param    mixed   $value  reference to an array element to be encoded
-    *
-    * @return   string  JSON-formatted name-value pair, like '"name":value'
-    * @access   private
-    */
-    function name_value($name, $value)
-    {
-        $encoded_value = $this->encode($value);
-
-        if(Services_JSON::isError($encoded_value)) {
-            return $encoded_value;
-        }
-
-        return $this->encode(strval($name)) . ':' . $encoded_value;
-    }
-
-   /**
-    * reduce a string by removing leading and trailing comments and whitespace
-    *
-    * @param    $str    string      string value to strip of comments and whitespace
-    *
-    * @return   string  string value stripped of comments and whitespace
-    * @access   private
-    */
-    function reduce_string($str)
-    {
-        $str = preg_replace(array(
-
-                // eliminate single line comments in '// ...' form
-                '#^\s*//(.+)$#m',
-
-                // eliminate multi-line comments in '/* ... */' form, at start of string
-                '#^\s*/\*(.+)\*/#Us',
-
-                // eliminate multi-line comments in '/* ... */' form, at end of string
-                '#/\*(.+)\*/\s*$#Us'
-
-            ), '', $str);
-
-        // eliminate extraneous space
-        return trim($str);
-    }
-
-   /**
-    * decodes a JSON string into appropriate variable
-    *
-    * @param    string  $str    JSON-formatted string
-    *
-    * @return   mixed   number, boolean, string, array, or object
-    *                   corresponding to given JSON input string.
-    *                   See argument 1 to Services_JSON() above for object-output behavior.
-    *                   Note that decode() always returns strings
-    *                   in ASCII or UTF-8 format!
-    * @access   public
-    */
-    function decode($str)
-    {
-        $str = $this->reduce_string($str);
-
-        switch (strtolower($str)) {
-            case 'true':
-                return true;
-
-            case 'false':
-                return false;
-
-            case 'null':
-                return null;
-
-            default:
-                $m = array();
-
-                if (is_numeric($str)) {
-                    // Lookie-loo, it's a number
-
-                    // This would work on its own, but I'm trying to be
-                    // good about returning integers where appropriate:
-                    // return (float)$str;
-
-                    // Return float or int, as appropriate
-                    return ((float)$str == (integer)$str)
-                        ? (integer)$str
-                        : (float)$str;
-
-                } elseif (preg_match('/^("|\').*(\1)$/s', $str, $m) && $m[1] == $m[2]) {
-                    // STRINGS RETURNED IN UTF-8 FORMAT
-                    $delim = substr($str, 0, 1);
-                    $chrs = substr($str, 1, -1);
-                    $utf8 = '';
-                    $strlen_chrs = strlen($chrs);
-
-                    for ($c = 0; $c < $strlen_chrs; ++$c) {
-
-                        $substr_chrs_c_2 = substr($chrs, $c, 2);
-                        $ord_chrs_c = ord($chrs{$c});
-
-                        switch (true) {
-                            case $substr_chrs_c_2 == '\b':
-                                $utf8 .= chr(0x08);
-                                ++$c;
-                                break;
-                            case $substr_chrs_c_2 == '\t':
-                                $utf8 .= chr(0x09);
-                                ++$c;
-                                break;
-                            case $substr_chrs_c_2 == '\n':
-                                $utf8 .= chr(0x0A);
-                                ++$c;
-                                break;
-                            case $substr_chrs_c_2 == '\f':
-                                $utf8 .= chr(0x0C);
-                                ++$c;
-                                break;
-                            case $substr_chrs_c_2 == '\r':
-                                $utf8 .= chr(0x0D);
-                                ++$c;
-                                break;
-
-                            case $substr_chrs_c_2 == '\\"':
-                            case $substr_chrs_c_2 == '\\\'':
-                            case $substr_chrs_c_2 == '\\\\':
-                            case $substr_chrs_c_2 == '\\/':
-                                if (($delim == '"' && $substr_chrs_c_2 != '\\\'') ||
-                                   ($delim == "'" && $substr_chrs_c_2 != '\\"')) {
-                                    $utf8 .= $chrs{++$c};
-                                }
-                                break;
-
-                            case preg_match('/\\\u[0-9A-F]{4}/i', substr($chrs, $c, 6)):
-                                // single, escaped unicode character
-                                $utf16 = chr(hexdec(substr($chrs, ($c + 2), 2)))
-                                       . chr(hexdec(substr($chrs, ($c + 4), 2)));
-                                $utf8 .= $this->utf162utf8($utf16);
-                                $c += 5;
-                                break;
-
-                            case ($ord_chrs_c >= 0x20) && ($ord_chrs_c <= 0x7F):
-                                $utf8 .= $chrs{$c};
-                                break;
-
-                            case ($ord_chrs_c & 0xE0) == 0xC0:
-                                // characters U-00000080 - U-000007FF, mask 110XXXXX
-                                //see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= substr($chrs, $c, 2);
-                                ++$c;
-                                break;
-
-                            case ($ord_chrs_c & 0xF0) == 0xE0:
-                                // characters U-00000800 - U-0000FFFF, mask 1110XXXX
-                                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= substr($chrs, $c, 3);
-                                $c += 2;
-                                break;
-
-                            case ($ord_chrs_c & 0xF8) == 0xF0:
-                                // characters U-00010000 - U-001FFFFF, mask 11110XXX
-                                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= substr($chrs, $c, 4);
-                                $c += 3;
-                                break;
-
-                            case ($ord_chrs_c & 0xFC) == 0xF8:
-                                // characters U-00200000 - U-03FFFFFF, mask 111110XX
-                                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= substr($chrs, $c, 5);
-                                $c += 4;
-                                break;
-
-                            case ($ord_chrs_c & 0xFE) == 0xFC:
-                                // characters U-04000000 - U-7FFFFFFF, mask 1111110X
-                                // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= substr($chrs, $c, 6);
-                                $c += 5;
-                                break;
-
-                        }
-
-                    }
-
-                    return $utf8;
-
-                } elseif (preg_match('/^\[.*\]$/s', $str) || preg_match('/^\{.*\}$/s', $str)) {
-                    // array, or object notation
-
-                    if ($str{0} == '[') {
-                        $stk = array(SERVICES_JSON_IN_ARR);
-                        $arr = array();
-                    } else {
-                        if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
-                            $stk = array(SERVICES_JSON_IN_OBJ);
-                            $obj = array();
-                        } else {
-                            $stk = array(SERVICES_JSON_IN_OBJ);
-                            $obj = new stdClass();
-                        }
-                    }
-
-                    array_push($stk, array('what'  => SERVICES_JSON_SLICE,
-                                           'where' => 0,
-                                           'delim' => false));
-
-                    $chrs = substr($str, 1, -1);
-                    $chrs = $this->reduce_string($chrs);
-
-                    if ($chrs == '') {
-                        if (reset($stk) == SERVICES_JSON_IN_ARR) {
-                            return $arr;
-
-                        } else {
-                            return $obj;
-
-                        }
-                    }
-
-                    //print("\nparsing {$chrs}\n");
-
-                    $strlen_chrs = strlen($chrs);
-
-                    for ($c = 0; $c <= $strlen_chrs; ++$c) {
-
-                        $top = end($stk);
-                        $substr_chrs_c_2 = substr($chrs, $c, 2);
-
-                        if (($c == $strlen_chrs) || (($chrs{$c} == ',') && ($top['what'] == SERVICES_JSON_SLICE))) {
-                            // found a comma that is not inside a string, array, etc.,
-                            // OR we've reached the end of the character list
-                            $slice = substr($chrs, $top['where'], ($c - $top['where']));
-                            array_push($stk, array('what' => SERVICES_JSON_SLICE, 'where' => ($c + 1), 'delim' => false));
-                            //print("Found split at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-
-                            if (reset($stk) == SERVICES_JSON_IN_ARR) {
-                                // we are in an array, so just push an element onto the stack
-                                array_push($arr, $this->decode($slice));
-
-                            } elseif (reset($stk) == SERVICES_JSON_IN_OBJ) {
-                                // we are in an object, so figure
-                                // out the property name and set an
-                                // element in an associative array,
-                                // for now
-                                $parts = array();
-                                
-                                if (preg_match('/^\s*(["\'].*[^\\\]["\'])\s*:\s*(\S.*),?$/Uis', $slice, $parts)) {
-                                    // "name":value pair
-                                    $key = $this->decode($parts[1]);
-                                    $val = $this->decode($parts[2]);
-
-                                    if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
-                                        $obj[$key] = $val;
-                                    } else {
-                                        $obj->$key = $val;
-                                    }
-                                } elseif (preg_match('/^\s*(\w+)\s*:\s*(\S.*),?$/Uis', $slice, $parts)) {
-                                    // name:value pair, where name is unquoted
-                                    $key = $parts[1];
-                                    $val = $this->decode($parts[2]);
-
-                                    if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
-                                        $obj[$key] = $val;
-                                    } else {
-                                        $obj->$key = $val;
-                                    }
-                                }
-
-                            }
-
-                        } elseif ((($chrs{$c} == '"') || ($chrs{$c} == "'")) && ($top['what'] != SERVICES_JSON_IN_STR)) {
-                            // found a quote, and we are not inside a string
-                            array_push($stk, array('what' => SERVICES_JSON_IN_STR, 'where' => $c, 'delim' => $chrs{$c}));
-                            //print("Found start of string at {$c}\n");
-
-                        } elseif (($chrs{$c} == $top['delim']) &&
-                                 ($top['what'] == SERVICES_JSON_IN_STR) &&
-                                 ((strlen(substr($chrs, 0, $c)) - strlen(rtrim(substr($chrs, 0, $c), '\\'))) % 2 != 1)) {
-                            // found a quote, we're in a string, and it's not escaped
-                            // we know that it's not escaped becase there is _not_ an
-                            // odd number of backslashes at the end of the string so far
-                            array_pop($stk);
-                            //print("Found end of string at {$c}: ".substr($chrs, $top['where'], (1 + 1 + $c - $top['where']))."\n");
-
-                        } elseif (($chrs{$c} == '[') &&
-                                 in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
-                            // found a left-bracket, and we are in an array, object, or slice
-                            array_push($stk, array('what' => SERVICES_JSON_IN_ARR, 'where' => $c, 'delim' => false));
-                            //print("Found start of array at {$c}\n");
-
-                        } elseif (($chrs{$c} == ']') && ($top['what'] == SERVICES_JSON_IN_ARR)) {
-                            // found a right-bracket, and we're in an array
-                            array_pop($stk);
-                            //print("Found end of array at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-
-                        } elseif (($chrs{$c} == '{') &&
-                                 in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
-                            // found a left-brace, and we are in an array, object, or slice
-                            array_push($stk, array('what' => SERVICES_JSON_IN_OBJ, 'where' => $c, 'delim' => false));
-                            //print("Found start of object at {$c}\n");
-
-                        } elseif (($chrs{$c} == '}') && ($top['what'] == SERVICES_JSON_IN_OBJ)) {
-                            // found a right-brace, and we're in an object
-                            array_pop($stk);
-                            //print("Found end of object at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-
-                        } elseif (($substr_chrs_c_2 == '/*') &&
-                                 in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
-                            // found a comment start, and we are in an array, object, or slice
-                            array_push($stk, array('what' => SERVICES_JSON_IN_CMT, 'where' => $c, 'delim' => false));
-                            $c++;
-                            //print("Found start of comment at {$c}\n");
-
-                        } elseif (($substr_chrs_c_2 == '*/') && ($top['what'] == SERVICES_JSON_IN_CMT)) {
-                            // found a comment end, and we're in one now
-                            array_pop($stk);
-                            $c++;
-
-                            for ($i = $top['where']; $i <= $c; ++$i)
-                                $chrs = substr_replace($chrs, ' ', $i, 1);
-
-                            //print("Found end of comment at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-
-                        }
-
-                    }
-
-                    if (reset($stk) == SERVICES_JSON_IN_ARR) {
-                        return $arr;
-
-                    } elseif (reset($stk) == SERVICES_JSON_IN_OBJ) {
-                        return $obj;
-
-                    }
-
-                }
-        }
-    }
-
-    /**
-     * @todo Ultimately, this should just call PEAR::isError()
-     */
-    function isError($data, $code = null)
-    {
-        if (class_exists('pear')) {
-            return PEAR::isError($data, $code);
-        } elseif (is_object($data) && (get_class($data) == 'services_json_error' ||
-                                 is_subclass_of($data, 'services_json_error'))) {
-            return true;
-        }
-
-        return false;
-    }
-}
-
-if (class_exists('PEAR_Error')) {
-
-    class Services_JSON_Error extends PEAR_Error
-    {
-        function Services_JSON_Error($message = 'unknown error', $code = null,
-                                     $mode = null, $options = null, $userinfo = null)
-        {
-            parent::PEAR_Error($message, $code, $mode, $options, $userinfo);
-        }
-    }
-
-} else {
-
-    /**
-     * @todo Ultimately, this class shall be descended from PEAR_Error
-     */
-    class Services_JSON_Error
-    {
-        function Services_JSON_Error($message = 'unknown error', $code = null,
-                                     $mode = null, $options = null, $userinfo = null)
-        {
-
-        }
-    }
-
-}
-    
-?>
\ No newline at end of file
diff --git a/plugins/video_zencoder/includes/zencoder.inc b/plugins/video_zencoder/includes/zencoder.inc
deleted file mode 100644
index c3023b0..0000000
--- a/plugins/video_zencoder/includes/zencoder.inc
+++ /dev/null
@@ -1,253 +0,0 @@
-<?php
-
-/*
- * @file
- * Class file to handle amazon s3 transfers.
- *
- */
-
-// Include our class file.
-require_once('Zencoder.php');
-
-define('VIDEO_ZC_PENDING', 0);
-define('VIDEO_ZC_WORKING', 1);
-define('VIDEO_ZC_ACTIVE', 2);
-define('VIDEO_ZC_FAILED', 3);
-
-class video_zencoder_api {
-
-  private $access_key;
-  private $limit;
-  private $bucket;
-
-  public function __construct() {
-    $this->access_key = variable_get('video_zencoder_api_key', '');
-    $this->limit = variable_get('amazon_s3_limit', 5);
-    $this->bucket = variable_get('amazon_s3_bucket', '');
-  }
-
-  /**
-   * create transcoding job on Zencoder.com
-   */
-  public function create($file) {
-    global $base_url;
-    // API Key
-    $api_key = variable_get('video_zencoder_api_key', '');
-    // File details
-    $filename = $file->filename;
-    // Get varialbes
-    $bucket = $this->bucket;
-    $thumb_no = variable_get('video_thumbs', 5);
-
-    $thumb_size = variable_get('video_thumbs_size', '160x120');
-    $thumb_base = $baseurl;
-    $thumb_prefix = $filename;
-    // dimentions
-    $dimentions = explode('x', $file->dimentions);
-
-    $notify_url = variable_get('zc_notify_url', '');
-    $notify_email = variable_get('zc_notify_email', '');
-
-    // Job details
-    $input_name = $bucket . '/' . $filename;
-//    watchdog('zencoder', $input_name);
-    // thumbnails
-    // Setup our thmbnail path.
-    $video_thumb_path = variable_get('video_thumb_path', 'video_thumbs');
-    $final_thumb_path = file_default_scheme() . ':/' . $video_thumb_path . '/' . $file->fid;
-
-    // Notifications
-//    if(!empty($notify_url))
-//    $notifications[] = array('format' => 'json', 'url' => 'http://123.231.58.90/drupal-6/postback/jobs');
-//    $url = $base_url . '/postback/jobs';
-    $url = 'http://123.231.63.138/postback/jobs';
-    $notifications[] = array('format' => 'json', 'url' => $url);
-
-    //get the presets
-    $presets = $file->presets;
-    $public = (variable_get('amazon_s3_private', FALSE)) ? 0 : 1;
-
-    // construct the output array with the presets
-    $zc_outputs = array();
-    foreach ($presets as $name => $preset) {
-      $zc_output = array();
-      $lable = 'VIDEO_' . $name . '_' . $file->fid;
-      $width = $dimentions[0];
-      $height = $dimentions[1];
-      $quality = $preset['quality'];
-      $speed = $preset['speed'];
-      $upscale = $preset['upscale'];
-      $stretch = $preset['stretch'];
-      $frame_rate = $preset['frame_rate'];
-      $max_frame_rate = $preset['max_frame_rate'];
-      $keyframe_interval = $preset['keyframe_interval'];
-      $video_bitrate = $preset['video_bitrate'];
-      $bitrate_cap = $preset['bitrate_cap'];
-      $buffer_size = $preset['buffer_size'];
-      $h264_profile = $preset['h264_profile'];
-      $h264_level = $preset['h264_level'];
-      $skip_video = $preset['skip_video'];
-      $audio_codec = $preset['audio_codec'];
-      $audio_bitrate = $preset['audio_bitrate'];
-      $audio_channels = $preset['audio_channels'];
-      $audio_sample_rate = $preset['audio_sample_rate'];
-      $skip_audio = $preset['skip_audio'];
-      $start_clip = $preset['start_clip'];
-      $clip_length = $preset['clip_length'];
-
-      if (!empty($lable))
-        $zc_output['label'] = $lable;
-      if (!empty($bucket))
-        $zc_output['url'] = 's3://' . $bucket . '/' . pathinfo($filename, PATHINFO_DIRNAME) . '/converted/' . pathinfo($filename, PATHINFO_FILENAME) . '.' . $preset['extension'];
-      if (!empty($public))
-        $zc_output['public'] = $public;
-      if (!empty($width))
-        $zc_output['width'] = $width;
-      if (!empty($height))
-        $zc_output['height'] = $height;
-      if (!empty($quality))
-        $zc_output['quality'] = $quality;
-      if (!empty($speed))
-        $zc_output['speed'] = $speed;
-      if (!empty($upscale))
-        $zc_output['upscale'] = $upscale;
-      if (!empty($frame_rate))
-        $zc_output['frame_rate'] = $frame_rate;
-      if (!empty($max_frame_rate))
-        $zc_output['max_frame_rate'] = $max_frame_rate;
-      if (!empty($keyframe_interval))
-        $zc_output['keyframe_interval'] = $keyframe_interval;
-      if (!empty($video_bitrate))
-        $zc_output['video_bitrate'] = $video_bitrate;
-      if (!empty($bitrate_cap))
-        $zc_output['bitrate_cap'] = $bitrate_cap;
-      if (!empty($buffer_size))
-        $zc_output['buffer_size'] = $buffer_size;
-      if (!empty($h264_profile))
-        $zc_output['h264_profile'] = $h264_profile;
-      if (!empty($h264_level))
-        $zc_output['h264_level'] = $h264_level;
-      if (!empty($skip_video))
-        $zc_output['skip_video'] = $skip_video;
-      if (!empty($audio_codec))
-        $zc_output['audio_codec'] = $audio_codec;
-      if (!empty($audio_bitrate))
-        $zc_output['audio_bitrate'] = $audio_bitrate;
-      if (!empty($audio_channels))
-        $zc_output['audio_channels'] = $audio_channels;
-      if (!empty($audio_sample_rate))
-        $zc_output['audio_sample_rate'] = $audio_sample_rate;
-      if (!empty($skip_audio))
-        $zc_output['skip_audio'] = $skip_audio;
-      if (!empty($start_clip))
-        $zc_output['start_clip'] = $start_clip;
-      if (!empty($clip_length))
-        $zc_output['clip_length'] = $clip_length;
-
-      // thumbnails
-      $thumbnails['number'] = $thumb_no;
-      if (!empty($thumb_size))
-        $thumbnails['thumb_size'] = $thumb_size;
-      if (!empty($bucket))
-        $thumbnails['base_url'] = 's3://' . $bucket . '/' . $final_thumb_path;
-      if (!empty($file->fid))
-        $thumbnails['prefix'] = $file->fid;
-      $zc_output['thumbnails'] = $thumbnails;
-
-      //notifications
-      if (!empty($notify_email))
-        $notifications[] = $notify_email;
-      $zc_output['notifications'] = $notifications;
-      $zc_outputs[] = $zc_output;
-    }
-
-
-    $encoding_job_json = array(
-//            'test' => 1,
-//            'download_connections' => -1,
-      'api_key' => $this->access_key,
-      'input' => 's3://' . $input_name,
-      'outputs' => $zc_outputs
-    );
-
-//    print_r(($encoding_job_json));
-//    exit;
-//    watchdog('zencoder', json_encode($encoding_job_json));
-
-    $encoding_job = new ZencoderJob(json_encode($encoding_job_json));
-    // Check if it worked
-    if ($encoding_job->created) {
-//      watchdog('zencoder', serialize($encoding_job));
-      return $encoding_job;
-    } else {
-      foreach ($encoding_job->errors as $error) {
-        //      echo $error."\n";
-        watchdog('zencoder', 'Zencoder reports some errors. !error', array('!error' => $error), WATCHDOG_ERROR);
-      }
-      return false;
-    }
-  }
-
-  /*
-   * Updates the database after a successful transfer to amazon.
-   */
-
-  public function update($video) {
-    $result = db_query("UPDATE {video_zencoder} SET status=%d, completed=%d WHERE jobid=%d",
-            $video->output->state, time(), $video->job->id);
-    return $result;
-  }
-
-  /*
-   * Verifies the existence of a file id, returns the row or false if none found.
-   */
-
-  public function load_job($jobid) {
-    $sql = db_query("SELECT * FROM {video_zencoder} WHERE jobid=%d", $jobid);
-    $row = db_fetch_object($sql);
-    return $row;
-  }
-
-  /**
-   * Create Zencoder user account
-   */
-  public function create_user($user) {
-
-    $request = new ZencoderRequest(
-            'https://app.zencoder.com/api/account',
-            false, // API key isn't needed for new account creation
-            array(
-              "terms_of_service" => "1",
-              "email" => $user->email,
-              "affiliate_code" => "drupal-video"
-            )
-    );
-
-    if ($request->successful) {
-      $results = $request->results;
-      variable_set('video_zencoder_api_key', $results['api_key']);
-      $message = drupal_mail('video_zencoder', 'video_zencoder', $user->email, language_default(), $results);
-      if (!$message['result']) {
-        drupal_set_message(t('Unable to send e-mail!. Your Zencoder Details are as below.<br/> <b>API Key</b> : !api_key<br/> <b>Password</b> : !password<br/>', array('!api_key' => $results['api_key'], '!password' => $results['password'])), 'status');
-      } else {
-//        drupal_mail('video_zencoder', 'video_zencoder', 'heshanmw@gmail.com', language_default(), $results);
-        drupal_set_message(t('Your account has been created and is ready to start processing on Zencoder'));
-      }
-//      return $request->results;
-      return true;
-//      variable_set('video_zencoder_api_key', '');
-    } else {
-      $errors = '';
-      foreach ($request->errors as $error) {
-        if ($error == 'Email has already been taken') {
-          drupal_set_message(t('Your account already exists on Zencoder. So !login to here and enter API key below', array('!login' => l(t('login'), 'https://app.zencoder.com/session/new'))));
-          variable_set('video_zencoder_api_key', 'Please enter your API Key');
-          return TRUE;
-        }
-        $errors .= $error;
-      }
-      return $errors;
-    }
-  }
-
-}
\ No newline at end of file
diff --git a/plugins/video_zencoder/transcoders/video_zencoder.inc b/plugins/video_zencoder/transcoders/video_zencoder.inc
deleted file mode 100644
index 1eb246a..0000000
--- a/plugins/video_zencoder/transcoders/video_zencoder.inc
+++ /dev/null
@@ -1,381 +0,0 @@
-<?php
-
-/*
- * @file
- * Transcoder class file to handle ffmpeg_wrapper settings and conversions.
- * @TODO
- * - Cancel transcode job when delete.
- * - Add number of cronjobs pertime  set to 5 now.
- * - Replace load_completed_job with load_job
- * - Add a metadata extractor class to extract width and height
- *
- */
-
-class video_zencoder implements transcoder_interface {
-
-  private $name = 'Zencoder';
-  private $value = 'video_zencoder';
-
-  public function generate_thumbnails($video) {
-    global $user;
-    // Setup our thmbnail path.
-    $video_thumb_path = variable_get('video_thumb_path', 'video_thumbs');
-    $final_thumb_path = file_default_scheme() . ':/' . $video_thumb_path . '/' . $video['fid'];
-
-    // Ensure the destination directory exists and is writable.
-    $directories = explode('/', $final_thumb_path);
-    // Get the file system directory.
-    $file_system = file_default_scheme() . ':/';
-    foreach ($directories as $directory) {
-      $full_path = isset($full_path) ? $full_path . '/' . $directory : $directory;
-      // Don't check directories outside the file system path.
-      if (strpos($full_path, $file_system) === 0) {
-        field_file_check_directory($full_path, FILE_CREATE_DIRECTORY);
-      }
-    }
-
-    $files = array();
-    // no thumbnails to generate
-    $number_of_thumbs = variable_get('video_thumbs', 5);
-    for ($i = 0; $i < $number_of_thumbs; $i++) {
-      // @TODO Remove hard coded file types
-      $filename = $video['fid'] . '_' . sprintf("%04d", $i) . '.png';
-      $thumbfile = $final_thumb_path . '/' . $filename;
-      //skip files already exists, this will save ffmpeg traffic
-      if (!is_file($thumbfile)) {
-        $default = drupal_get_path('module', 'video') . '/images/no-thumb.png';
-        // Download generated thumbnails from S3.
-        if (video_s3_get_object_info($thumbfile))
-          $s3_get_object = video_s3_get_object($thumbfile, $thumbfile);
-        else {
-          $thumbfile = $final_thumb_path . '/no-thumb.png';
-          file_copy($default, $thumbfile, FILE_EXISTS_REPLACE);
-        }
-//          $thumbfile = drupal_get_path('module', 'video') . '/images/no_thumb.gif';
-        if (!file_exists($thumbfile)) {
-          $error_param = array('%file' => $thumbfile, '%out' => $s3_get_object);
-          $error_msg = t("Error downloading thumbnail for video: generated file %file does not exist.<br />S3 Output:<br />%out", $error_param);
-          // Log the error message.
-          watchdog('zencoder', $error_msg, array(), WATCHDOG_ERROR);
-          continue;
-        }
-      }
-      // Begin building the file object.
-      // @TODO : use file_munge_filename()
-      $file = new stdClass();
-      $file->uid = $user->uid;
-      $file->status = FILE_STATUS_TEMPORARY;
-      $file->filename = trim($filename);
-      $file->filepath = $thumbfile;
-      $file->filemime = file_get_mimetype($filename);
-      $file->filesize = filesize($thumbfile);
-      $file->timestamp = time();
-      $files[] = $file;
-    }
-    return $files;
-  }
-
-  public function video_converted_extension() {
-    return variable_get('video_zencoder_ext', 'flv');
-  }
-
-  public function convert_video($video) {
-    // get the active jobs and check for the status
-    if ($video->video_status == VIDEO_RENDERING_ACTIVE) {
-      return;
-    }
-    // We need to check if this file id exists in our S3 table to avoid file not found error.
-    $s3_video = db_query("SELECT * FROM {video_s3} WHERE fid=%d", $video->fid);
-    if ($s3_file = db_fetch_object($s3_video)) {
-      // This is a s3 file, lets verify it has been pushed and if so lets push to Zencoder queue.
-      if ($s3_file->status == VIDEO_S3_COMPLETE) {
-        $video_s3 = $s3_file;
-      }
-    } else {
-      watchdog('zencoder', t('You must active the Video S3 module to work with Zencoder, file is not found in S3 tables', array()), array(), WATCHDOG_ERROR);
-//      return FALSE;
-    }
-
-    // If we have a video lets go ahead and send it.
-    if (is_object($video_s3)) {
-      // This will update our current video status to active.
-      $this->change_status($video->vid, VIDEO_RENDERING_ACTIVE);
-      // bucket name
-      $bucket = variable_get('amazon_s3_bucket', '');
-      $ssl = variable_get('amazon_s3_ssl', FALSE);
-
-      $filepath = $video_s3->filepath;
-      $video_s3->dimensions = $video->dimensions;
-      $filename = str_replace(' ', '_', $video_s3->filename);
-      $video_s3->presets = $video->presets;
-      module_load_include('inc', 'video_zencoder', '/includes/zencoder');
-      $zc = new video_zencoder_api;
-      if ($encoding_job = $zc->create($video_s3)) {
-        // Update our table.
-        $video->vid = $video->vid;
-        //job id
-        $video->jobid = $encoding_job->id;
-        $outputs = new stdClass();
-//        print_r($encoding_job->outputs);
-        foreach ($encoding_job->outputs as $output) {
-          $outputs->{$output->id}->id = $output->id;
-          $outputs->{$output->id}->label = $output->label;
-          $outputs->{$output->id}->url = $output->url;
-          $outputs->{$output->id}->state = $output->state;
-          $outputs->{$output->id}->error_message = $output->error_message;
-          $outputs->{$output->id}->error_link = $output->error_link;
-        }
-        $video->data = serialize($outputs);
-        // write output values to the table
-        if ($this->update($video)) {
-          watchdog('zencoder', t('Successfully created trancoding job on !jobid.', array('!jobid' => $video->jobid)), array(), WATCHDOG_INFO);
-        }
-      } else {
-        watchdog('zencoder', 'Failed to queus our file to Zencoder.', array(), WATCHDOG_ERROR);
-        $this->change_status($video->vid, VIDEO_RENDERING_FAILED);
-        return FALSE;
-      }
-    } else {
-      watchdog('zencoder', 'We did not find the file id: ' . $video->fid . ' or it is still queued for ffmpeg processing or S3 push.', array(), WATCHDOG_DEBUG);
-//      return FALSE;
-    }
-  }
-
-  /**
-   * Interface Implementations
-   * @see sites/all/modules/video/includes/transcoder_interface#get_name()
-   */
-  public function get_name() {
-    return $this->name;
-  }
-
-  /**
-   * Interface Implementations
-   * @see sites/all/modules/video/includes/transcoder_interface#get_value()
-   */
-  public function get_value() {
-    return $this->value;
-  }
-
-  /**
-   * Interface Implementations
-   * @see sites/all/modules/video/includes/transcoder_interface#get_help()
-   */
-  public function get_help() {
-    $help = l(t('Zencoder'), 'http://zencoder.com/');
-    return $help;
-  }
-
-  /**
-   * Interface Implementations
-   * @see sites/all/modules/video/includes/transcoder_interface#admin_settings()
-   */
-  public function admin_settings() {
-    global $user;
-    // check amazon s3 module is exists or not
-    if (!module_exists('video_s3'))
-      drupal_set_message(t('You must enable Video Amazon S3 Module to enable this module.'), 'error');
-
-    $form = array();
-    $form['video_zencoder_start'] = array(
-      '#type' => 'markup',
-      '#value' => '<div id="video_zencoder">',
-    );
-    $zencoder_api = variable_get('video_zencoder_api_key', null);
-    if (!isset($zencoder_api) && empty($zencoder_api)) {
-      $form['zencoder_user'] = array(
-        '#type' => 'fieldset',
-        '#title' => t('Zencoder User'),
-        '#collapsible' => FALSE,
-        '#collapsed' => FALSE,
-        '#description' => t('Save configurations to creare your !link account to transcode and manage your videos using Zencode  API. Once you save your configurations then this will automatically create an account on the Zencoder.com and password and all ther other relevent details will be emailled to you.', array('!link' => l(t('Zencoder.com'), 'http://zencoder.com')))
-      );
-      $form['zencoder_user']['zencoder_username'] = array(
-        '#type' => 'textfield',
-        '#title' => t('Your email address'),
-        '#default_value' => variable_get('zencoder_username', 'me@localhost'),
-        '#size' => 50,
-        '#description' => t('Make sure the email is accurate, since we will send all the password details to manage transcoding online and API key details to this.')
-      );
-
-      $form['zencoder_user']['agree_terms_zencoder'] = array(
-        '#type' => 'checkbox',
-        '#title' => t('Agree Zencoder Terms and Conditions.'),
-        '#default_value' => variable_get('agree_terms_zencoder', TRUE),
-        '#description' => t('Read terms and conditions on !link.', array('!link' => l(t('Zencoder.com'), 'http://zencoder.com'))),
-      );
-    } else {
-      // Zencoder API is exists
-      $form['zencoder_info'] = array(
-        '#type' => 'fieldset',
-        '#title' => t('Zencoder API'),
-        '#collapsible' => FALSE,
-        '#collapsed' => FALSE,
-      );
-      $form['zencoder_info']['video_zencoder_api_key'] = array(
-        '#type' => 'textfield',
-        '#title' => t('Zencoder API Key'),
-        '#default_value' => variable_get('video_zencoder_api_key', null),
-        '#description' => t('Zencoder API Key. Click <b>Reset to default</b> button to add new account.')
-      );
-      $form['zencoder_info']['video_thumbs'] = array(
-        '#type' => 'textfield',
-        '#title' => t('Number of thumbnails'),
-        '#description' => t('Number of thumbnails to display from video.'),
-        '#default_value' => variable_get('video_thumbs', 5),
-        '#size' => 5
-      );
-      $form['zencoder_info']['video_thumbs_size'] = array(
-        '#type' => 'textfield',
-        '#title' => t('Dimention of thumbnails'),
-        '#description' => t('Size of thumbnails to extract from video.'),
-        '#default_value' => variable_get('video_thumbs_size', '160x120'),
-        '#size' => 10
-      );
-    }
-    $form['video_zencoder_end'] = array(
-      '#type' => 'markup',
-      '#value' => '</div>',
-    );
-    return $form;
-  }
-
-  /**
-   * Interface Implementations
-   * @see sites/all/modules/video/includes/transcoder_interface#admin_settings_validate()
-   */
-  public function admin_settings_validate($form, &$form_state) {
-    $zencoder_api = isset($form_state['values']['video_zencoder_api_key']) ? $form_state['values']['video_zencoder_api_key'] : NULL;
-    if (isset($zencoder_api) && !empty($zencoder_api) || $form_state['values']['video_convertor'] != 'video_zencoder') {
-      if (variable_get('video_filesystem', 'drupal') != 'video_s3') {
-        form_set_error('video_zencoder', t('You must enable the Amazon S3 as !link.', array('!link' => l(t('FileSystem'), 'admin/settings/video/filesystem'))));
-      }
-      return;
-    }
-
-    $errors = false;
-    // check terms and condition
-    if ($form_state['values']['agree_terms_zencoder'] == 0) {
-      $errors = true;
-      form_set_error('agree_terms_zencoder', t('You must agree terms and conditions.', array()));
-    }
-    // check for email exists
-    // Validate the e-mail address:
-    if ($error = user_validate_mail($form_state['values']['zencoder_username'])) {
-      $errors = true;
-      form_set_error('zencoder_username', $error);
-    }
-
-    // get the API key from zencoder and save it to variable
-    if (!$errors) {
-      $email = $form_state['values']['zencoder_username'];
-      module_load_include('inc', 'video_zencoder', '/includes/zencoder');
-      $zc = new video_zencoder_api;
-//    if(!($error = $zc->create_user($user)))
-//            form_set_error('zencoder_username', $error);
-      $user = new stdClass;
-      $user->email = $email;
-      $result = $zc->create_user($user);
-      if ($result !== true)
-        form_set_error('zencoder_username', $result);
-    }
-  }
-
-  /**
-   * Return the dimensions of a video
-   */
-  public function get_dimensions($video) {
-    // @TODO get object properties
-    return;
-  }
-
-  public function create_job($video) {
-    return db_query("INSERT INTO {video_zencoder} (fid, status, dimensions) VALUES (%d, %d, '%s')", $video['fid'], VIDEO_RENDERING_PENDING, $video['dimensions']);
-  }
-
-  public function update_job($video) {
-    if (!$this->load_job($video['fid']))
-      return;
-    //lets update our table to include the nid
-    db_query("UPDATE {video_zencoder} SET nid=%d WHERE fid=%d", $video['nid'], $video['fid']);
-  }
-
-  public function delete_job($video) {
-    if (!$this->load_job($video->fid))
-      return;
-    //lets get all our videos and unlink them
-    $sql = db_query("SELECT vid FROM {video_zencoder} WHERE fid=%d", $video->fid);
-    //we loop here as future development will include multiple video types (HTML 5)
-    while ($row = db_fetch_object($sql)) {
-      // @TODO : cancel the job to transcode
-    }
-    //now delete our rows.
-    db_query('DELETE FROM {video_zencoder} WHERE fid = %d', $video->fid);
-  }
-
-  public function load_job($fid) {
-    $job = null;
-    $result = db_query('SELECT f.*, vf.vid, vf.nid, vf.dimensions, vf.status as video_status FROM {video_zencoder} vf LEFT JOIN {files} f ON vf.fid = f.fid WHERE f.fid=vf.fid AND f.fid = %d', $fid);
-    $job = db_fetch_object($result);
-    if (!empty($job))
-      return $job;
-    else
-      return FALSE;
-  }
-
-  public function load_job_queue() {
-    // load jobs with status as pending and active both
-    $total_videos = variable_get('video_instances', 5);
-    $videos = array();
-    $result = db_query_range('SELECT f.*, vf.vid, vf.nid, vf.dimensions, vf.status as video_status FROM {video_zencoder} vf LEFT JOIN {files} f ON vf.fid = f.fid WHERE vf.status = %d AND f.status = %d ORDER BY f.timestamp',
-            VIDEO_RENDERING_PENDING, FILE_STATUS_PERMANENT, 0, $total_videos);
-
-    while ($row = db_fetch_object($result)) {
-      $videos[] = $row;
-    }
-    return $videos;
-  }
-
-  /**
-   * @todo : replace with the load job method
-   * @param <type> $video
-   * @return <type>
-   */
-  public function load_completed_job(&$video) {
-    module_load_include('inc', 'video_s3', '/includes/amazon_s3');
-    $video_row = db_fetch_object(db_query('SELECT data FROM {video_zencoder} WHERE fid = %d', $video->fid));
-    $data = unserialize($video_row->data);
-    if(empty($data))
-      return $video;
-    foreach ($data as $value) {
-      $extension = pathinfo($value->url, PATHINFO_EXTENSION);
-      $video->files->{$extension}->filename = pathinfo($value->url, PATHINFO_FILENAME) . '.' . $extension;
-      $video->files->{$extension}->filepath = $value->url;
-      $video->files->{$extension}->url = (!variable_get('amazon_s3_private', FALSE)) ? $value->url : video_s3_get_authenticated_url($video->filename);
-      $video->files->{$extension}->extension = $extension;
-      $video->player = strtolower($extension);
-    }
-    return $video;
-  }
-
-  /**
-   * Change the status of the file.
-   *
-   * @param (int) $vid
-   * @param (int) $status
-   */
-  public function change_status($vid, $status) {
-    $result = db_query('UPDATE {video_zencoder} SET status = %d WHERE vid = %d ', $status, $vid);
-  }
-
-  /*
-   * Updates the database after a successful transfer to amazon.
-   */
-
-  private function update($video) {
-    $result = db_query("UPDATE {video_zencoder} SET jobid = %d, completed=%d, data='%s' WHERE vid=%d",
-            $video->jobid, time(), $video->data, $video->vid);
-    return $result;
-  }
-
-}
\ No newline at end of file
diff --git a/plugins/video_zencoder/video_zencoder.info b/plugins/video_zencoder/video_zencoder.info
deleted file mode 100644
index d7d221a..0000000
--- a/plugins/video_zencoder/video_zencoder.info
+++ /dev/null
@@ -1,7 +0,0 @@
-
-name = Zencoder API on Video
-description = Zencoder is a webservice to transcode videos.
-package = Video
-core = 7.x
-dependencies[] = video
-dependencies[] = video_s3
\ No newline at end of file
diff --git a/plugins/video_zencoder/video_zencoder.install b/plugins/video_zencoder/video_zencoder.install
deleted file mode 100644
index 513ebe1..0000000
--- a/plugins/video_zencoder/video_zencoder.install
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-
-
-/**
- * @file
- * Provides installation functions for video_s3.module.
- */
-
-/**
- * Implementation of hook_schema().
- */
-function video_zencoder_schema() {
-  $schema['video_zencoder'] = array(
-    'description' => t('Store video s3 cdn and convert with zencoder webservice'),
-    'fields' => array(
-      'vid' => array(
-        'description' => t('Auto Increment id'),
-        'type' => 'serial',
-        'unsigned' => TRUE,
-        'not null' => TRUE,
-      ),
-      'fid' => array(
-        'description' => t('Original file id'),
-        'type' => 'int',
-        'unsigned' => TRUE,
-        'not null' => TRUE,
-        'default' => 0,
-      ),
-      'nid' => array(
-        'description' => t('Node id'),
-        'type' => 'int',
-        'unsigned' => TRUE,
-        'not null' => TRUE,
-        'default' => 0,
-      ),
-      'jobid' => array(
-        'description' => t('Job id'),
-        'type' => 'int',
-        'unsigned' => TRUE,
-        'not null' => TRUE,
-        'default' => 0,
-      ),
-      'status' => array(
-        'description' => t('Status of the cdn transfer'),
-        'type' => 'int',
-        'unsigned' => TRUE,
-        'not null' => TRUE,
-        'default' => 0,
-      ),
-      'dimensions' => array(
-        'type' => 'varchar',
-        'length' => '255',
-        'default' => '',
-        'description' => t('The dimensions of the video.'),
-      ),
-      'completed' => array(
-        'description' => t('Time of successful completion to amazon.'),
-        'type' => 'int',
-        'not null' => TRUE,
-        'default' => 0,
-      ),
-      'data' => array(
-        'type' => 'text',
-        'not null' => FALSE,
-        'size' => 'big',
-        'description' => 'A serialized array of converted files. Use of this field is discouraged and it will likely disappear in a future version of Drupal.',
-      ),
-    ),
-    'indexes' => array(
-      'status' => array('status'),
-      'file' => array('fid'),
-    ),
-    'primary key' => array('vid'),
-  );
-  return $schema;
-}
-
-/**
- * Implementation of hook_install().
- */
-function video_zencoder_install() {
-  drupal_install_schema('video_zencoder');
-  // set the module weight to low since we need this to load later time than in S3
-  db_query("UPDATE {system} SET weight = 50 WHERE name = 'video_zencoder'");
-}
-
-/**
- * Implementation of hook_uninstall().
- */
-function video_zencoder_uninstall() {
-  drupal_uninstall_schema('video_zencoder');
-  // TODO : Delete our variables.
-}
-
-// ALTER TABLE `video_zencoder` ADD `dimensions` VARCHAR( 255 ) NULL AFTER `filesize` ;
-/**
- * Update 6401
- * Adding new dimentaion row to the table
- * @return <type>
- */
-function video_zencoder_update_6401() {
-  $ret = array();
-  // set settings column to accept larger values
-  switch ($GLOBALS['db_type']) {
-    case 'mysql':
-    case 'mysqli':
-      $ret[] = update_sql('ALTER TABLE {video_zencoder} ADD dimensions VARCHAR( 255 ) NULL NULL AFTER filesize');
-      break;
-
-    case 'pgsql':
-      db_add_column($ret, 'video_zencoder', 'dimensions', 'VARCHAR', array('null' => TRUE));
-      break;
-  }
-
-  return $ret;
-}
-
-/**
- * Update 6402
- * Adding data field and remove unwanted fields from the table
- * @return <type>
- */
-function video_zencoder_update_6402() {
-  $ret = array();
-  // drop un wanted fields in video zencoder
-  db_drop_field($ret, 'video_zencoder', 'filesize');
-  db_drop_field($ret, 'video_zencoder', 'outputid');
-  db_drop_field($ret, 'video_zencoder', 'bucket');
-  db_drop_field($ret, 'video_zencoder', 'filename');
-  db_drop_field($ret, 'video_zencoder', 'filepath');
-  db_drop_field($ret, 'video_zencoder', 'filemime');
-  db_add_column($ret, 'video_zencoder', 'data', 'longtext', array('null' => TRUE));
-  return $ret;
-}
diff --git a/plugins/video_zencoder/video_zencoder.module b/plugins/video_zencoder/video_zencoder.module
deleted file mode 100644
index 7f2218e..0000000
--- a/plugins/video_zencoder/video_zencoder.module
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-
-/**
- * @file
- * Provides wrapper functions for the s3 amazon webservices.
- * @todo
- * - cleand up the _video_zencoder_postback_jobs() function
- * - Add to select random thumbnails to the download image.
- */
-/*
- * Implementation of hook_cron().
- */
-defined('VIDEO_RENDERING_PENDING') ||
-    define('VIDEO_RENDERING_PENDING', 1);
-defined('VIDEO_RENDERING_ACTIVE') ||
-    define('VIDEO_RENDERING_ACTIVE', 5);
-defined('VIDEO_RENDERING_COMPLETE') ||
-    define('VIDEO_RENDERING_COMPLETE', 10);
-defined('VIDEO_RENDERING_FAILED') ||
-    define('VIDEO_RENDERING_FAILED', 20);
-
-/**
- * Implementation of hook_menu().
- */
-function video_zencoder_menu() {
-  $items = array();
-  $items['postback/jobs'] = array(
-//    'title' => 'Video',
-//    'description' => 'Configure different aspects of the video module and its plugins',
-    'page callback' => '_video_zencoder_postback_jobs',
-    'access arguments' => array('access content'),
-    'type' => MENU_CALLBACK,
-  );
-  return $items;
-}
-
-/**
- * This will handle Zencoder postback once video conversion is completed
- *
- */
-function _video_zencoder_postback_jobs() {
-// get JSON post data
-  $data = file_get_contents("php://input");
-  watchdog('zencoder', t('Postback received from the Zencoder Transcoding servers.' . serialize($data)));
-//    print_r($data);
-//  exit;
-// get the file object by zenocder job id
-  $video = json_decode($data);
-//  print_r($zc);
-//  $zc_job_id = $video->job->id;
-  $zc_job_state = trim($video->job->state);
-//  $zc_output_id = $video->output->id;
-  $zc_output_state = trim($video->output->state);
-//  $zc_output_url = $video->output->url;
-  if ($zc_output_state == 'finished' && $zc_job_state == 'finished')
-    $video->output->state = VIDEO_RENDERING_COMPLETE;
-  if ($zc_output_state == 'failed' || $zc_job_state == 'failed')
-    $video->output->state = VIDEO_RENDERING_FAILED;
-  if ($zc_job_state == 'processing') {
-    watchdog('zencoder', t('Job !jobid is processing.', array('!jobid' => $video->job->id)));
-    return;
-  }
-
-// update the Zencoder Job
-  module_load_include('inc', 'video_zencoder', '/includes/zencoder');
-  $zc = new video_zencoder_api;
-// Lets run delete.
-  $videodb = $zc->load_job($video->job->id);
-//  print_r($video);
-//  echo $nid = $videodb->nid;
-//  echo $vid = $videodb->vid;
-//  echo $fid = $videodb->fid;
-
-  if ($video->output->state == VIDEO_RENDERING_COMPLETE) {
-//    echo 'completed';
-    $nid = $videodb->nid;
-    $vid = $videodb->vid;
-    $fid = $videodb->fid;
-//    print_r($videodb);
-//    echo 'working completed';
-    if (!db_query('UPDATE {video_zencoder} SET status = %d WHERE vid = %d ', VIDEO_RENDERING_COMPLETE, $vid))
-      watchdog('zencoder', t('Error updating zencoder status.', array()), NULL, WATCHDOG_ERROR);
-
-    if (!db_query("UPDATE {node} SET status=%d WHERE nid=%d", 1, $nid))
-      watchdog('zencoder', t('Error pulishing node.', array()), NULL, WATCHDOG_ERROR);
-
-//    print_r($video);
-// update the thumbanils
-// this will update the default thumbnails, if user want to select another one then they wil need to edit the node
-// Setup our thmbnail path.
-    $video_thumb_path = variable_get('video_thumb_path', 'video_thumbs');
-    $final_thumb_path = file_default_scheme() . ':/' . $video_thumb_path . '/' . $fid;
-//    $i = rand(0, (variable_get('no_of_video_thumbs', 5) - 1));
-    $filename = $fid . '_' . sprintf("%04d", 1) . '.png';
-    $thumbfile = $final_thumb_path . '/' . $filename;
-
-    if (video_s3_get_object_info($thumbfile)) {
-      $default = $final_thumb_path . '/no-thumb.png';
-      file_delete($default);
-      if (video_s3_get_object($thumbfile, $default))
-        watchdog('zencoder', t('Successfully downloaded the thumbnails file and replaced the default image.'));
-      else
-        watchdog('zencoder', t('Download thumbanils files is failed.'), array(), WATCHDOG_ERROR);
-    }
-//      file_copy($default, $thumbfile, FILE_EXISTS_REPLACE);
-    watchdog('zencoder', t('Updated the Zencoder Job !id to states !states.', array('!id' => $video->job->id, '!states' => $zc_output_state)));
-  }
-  else if ($video->output->state == VIDEO_RENDERING_FAILED) {
-    echo 'working failed';
-    $this->change_status($vid, VIDEO_RENDERING_FAILED);
-    watchdog('zencoder', t('Zencoder job failed converting videos, please login to zencoder web and check the erros.', array()), NULL, WATCHDOG_ERROR);
-  } else {
-    echo 'working something else';
-  }
-}
-
-/**
- * Implementation of hook_mail().
- */
-function video_zencoder_mail($key, &$message, $params) {
-  $language = $message['language'];
-  $message['subject'] .= 'Zencoder Registration Details for Drupal Video';
-  $message['body'][] = video_zencoder_mail_default($params);
-}
-
-function video_zencoder_mail_default($params) {
-  return t(
-      'Welcome to Zencoder for Drupal
--------------------------------
-
-Your account has been created and is ready to start processing.
-
-Your account details are as below.
-
-API Key : %api_key
-Password : %password
-
-* Login URL: https://app.zencoder.com/login
-
-You can get help at the following places:
-
-* Our chat room at http://zencoder.com/chat
-* Customer forums at https://help.zencoder.com/forums
-* The help desk at https://help.zencoder.com/tickets/new
-
-We\'d love to hear from you. Let us know how we can help. Thanks!
-
-Thanks,
--Zencoder for Drupal Team', array('%api_key' => $params['api_key'], '%password' => $params['password']));
-}
-