diff options
| author | Silvio <silvio@devlet.com.br> | 2011-07-12 10:26:40 -0300 |
|---|---|---|
| committer | Silvio <silvio@devlet.com.br> | 2011-07-12 10:26:40 -0300 |
| commit | 84a089eb09ab21d5062faa3b4021f95da930caaf (patch) | |
| tree | 04e6efe1d61c0dce3f5c526ab184e89588d7a878 /transcoders | |
| parent | d598b738b366190db350b95cebb1e1cf0e1c54c6 (diff) | |
| parent | b2eb0df792e7724538c4afeb7d8929a241a03773 (diff) | |
| download | video-84a089eb09ab21d5062faa3b4021f95da930caaf.tar.gz video-84a089eb09ab21d5062faa3b4021f95da930caaf.tar.bz2 | |
Merge branch '7.x-1.x' of http://git.drupal.org/project/video into 7.x-1.x
Conflicts:
transcoders/video_ffmpeg_php.inc
Diffstat (limited to 'transcoders')
| -rw-r--r-- | transcoders/video_ffmpeg.inc | 2 | ||||
| -rw-r--r-- | transcoders/video_phpvideotoolkit.inc | 4 |
2 files changed, 2 insertions, 4 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..a16aded 100644 --- a/transcoders/video_phpvideotoolkit.inc +++ b/transcoders/video_phpvideotoolkit.inc @@ -54,7 +54,6 @@ class video_phpvideotoolkit implements transcoder_interface { foreach ($available_codecs as $key => $value) { $codecs['encode'][$key] = array(); $codecs['decode'][$key] = array(); - foreach ($value as $codec_key => $codec) { if ($codec['encode']) { $codecs['encode'][$key][$codec_key] = $codec['fullname']; @@ -64,7 +63,6 @@ class video_phpvideotoolkit implements transcoder_interface { } } } - return $codecs; } @@ -166,7 +164,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); |