aboutsummaryrefslogtreecommitdiff
path: root/includes/conversion.inc
diff options
context:
space:
mode:
authorHeshan <heshan@heidisoft.com>2011-03-17 12:42:05 +0530
committerHeshan <heshan@heidisoft.com>2011-03-17 12:42:05 +0530
commit87782dfb64baed1715634b08c51a5f2a6d77eebb (patch)
tree2fc2ab08845c7d0c07eb8ed22419e6d8cd45d419 /includes/conversion.inc
parentc2132e3e04247ef8d39540161be895a9ceec63fd (diff)
parent972dd76d32128c6180271e5d10aff89a45f0ae74 (diff)
downloadvideo-87782dfb64baed1715634b08c51a5f2a6d77eebb.tar.gz
video-87782dfb64baed1715634b08c51a5f2a6d77eebb.tar.bz2
Merge branch '7.x-1.x' of git.drupal.org:project/video into 7.x-1.x
Diffstat (limited to 'includes/conversion.inc')
-rw-r--r--includes/conversion.inc4
1 files changed, 4 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();
+ }
}