Merge branch '7.x-1.x' of git.drupal.org:project/video into 7.x-1.x

2 files changed, 10 insertions, 0 deletions

diff --git a/includes/conversion.inc b/includes/conversion.inc
index 493532e..59414cc 100644
--- a/includes/conversion.inc
+++ b/includes/conversion.inc
@@ -105,6 +105,10 @@ class video_conversion {
   public function load_job($fid) {
     return $this->transcoder->load_job($fid);
   }
+  
+  public function get_codecs() {
+    return $this->transcoder->get_codecs();
+  }
 
 }
 
diff --git a/includes/transcoder.inc b/includes/transcoder.inc
index dd8a47e..30aa6ba 100644
--- a/includes/transcoder.inc
+++ b/includes/transcoder.inc
@@ -207,6 +207,10 @@ class video_transcoder {
     return $this->transcoder->load_completed_job($video);
   }
 
+  public function get_codecs() {
+    return $this->transcoder->get_codecs();
+  }
+
 }
 
 interface transcoder_interface {
@@ -218,6 +222,8 @@ interface transcoder_interface {
   public function load_job($fid);
 
   public function load_job_queue();
+  
+  public function get_codecs();
 
   public function load_completed_job(&$video);