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 /video.theme.inc | |
| 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 'video.theme.inc')
| -rw-r--r-- | video.theme.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/video.theme.inc b/video.theme.inc index 065845a..b70e065 100644 --- a/video.theme.inc +++ b/video.theme.inc @@ -235,8 +235,8 @@ function theme_video_html5($variables) { $items = _video_object_to_array($video->files); $items +=array('thumbnail' => (array) $video->thumbnail); $attributes = array(); - $attributes['width'] = $video->width; - $attributes['height'] = $video->height; + $attributes['width'] = $video->player_width;; + $attributes['height'] = $video->player_height; return theme('videojs', array('items' => $items, 'player_id' => 'video-' . $video->fid, 'attributes' => $attributes)); break; } |