aboutsummaryrefslogtreecommitdiff
path: root/transcoders
diff options
context:
space:
mode:
authorHeshan <heshan@heidisoft.com>2011-07-03 10:46:13 +0530
committerHeshan <heshan@heidisoft.com>2011-07-03 10:46:13 +0530
commit58fcf00150ebff58329919d9ec7eaa6f7e228ff2 (patch)
treebfab98c3166f1212f4538c422d6367224f7182fe /transcoders
parente623600b0c2291b1420a29e9529a990bcc7d9f22 (diff)
downloadvideo-58fcf00150ebff58329919d9ec7eaa6f7e228ff2.tar.gz
video-58fcf00150ebff58329919d9ec7eaa6f7e228ff2.tar.bz2
#1117018 by hoomanb Multiple resolutions for the same preset/extension not possible
Diffstat (limited to 'transcoders')
-rw-r--r--transcoders/video_ffmpeg.inc2
-rw-r--r--transcoders/video_phpvideotoolkit.inc2
2 files changed, 2 insertions, 2 deletions
diff --git a/transcoders/video_ffmpeg.inc b/transcoders/video_ffmpeg.inc
index 1c2dcc6..a2aecad 100644
--- a/transcoders/video_ffmpeg.inc
+++ b/transcoders/video_ffmpeg.inc
@@ -148,7 +148,7 @@ class video_ffmpeg implements transcoder_interface {
&& variable_get('video_use_preset_wxh', FALSE)) {
$video->dimensions = $settings['width'] . 'x' . $settings['height'];
}
- $converted = $converted_base_dir . '/' . file_munge_filename(str_replace(' ', '_', pathinfo($original_video_path, PATHINFO_FILENAME)) . '.' . $settings['video_extension'], $settings['video_extension']);
+ $converted = $converted_base_dir . '/' . file_munge_filename(str_replace(' ', '_', pathinfo($original_video_path, PATHINFO_FILENAME)) . '_' . strtolower($name) . '.' . $settings['video_extension'], $settings['video_extension']);
//get the actual video file path from the stream wrappers
$converted_video_path = drupal_realpath($converted);
$dimensions = $this->dimensions($video);
diff --git a/transcoders/video_phpvideotoolkit.inc b/transcoders/video_phpvideotoolkit.inc
index b4bc96e..5306fed 100644
--- a/transcoders/video_phpvideotoolkit.inc
+++ b/transcoders/video_phpvideotoolkit.inc
@@ -166,7 +166,7 @@ class video_phpvideotoolkit implements transcoder_interface {
&& variable_get('video_use_preset_wxh', FALSE)) {
$video->dimensions = $settings['width'] . 'x' . $settings['height'];
}
- $converted_filename = file_munge_filename(str_replace(' ', '_', pathinfo($original_video_path, PATHINFO_FILENAME)) . '.' . $settings['video_extension'], $settings['video_extension']);
+ $converted_filename = file_munge_filename(str_replace(' ', '_', pathinfo($original_video_path, PATHINFO_FILENAME)) . '_' . strtolower($name) . '.' . $settings['video_extension'], $settings['video_extension']);
$converted = $converted_base_dir . '/' . $converted_filename;
//get the actual video file path from the stream wrappers
$converted_video_path = drupal_realpath($converted);