diff options
| author | Joar Wandborg <git@wandborg.com> | 2011-10-14 03:17:06 +0200 |
|---|---|---|
| committer | Joar Wandborg <git@wandborg.com> | 2011-10-14 03:17:06 +0200 |
| commit | e9c1b9381deb51f5b8b40580cea41a73eec65df7 (patch) | |
| tree | 40e02cb514fadb77eeeb825d727538dc14bece9c /mediagoblin/templates | |
| parent | a7ca2a72118f0e0e72bdc2a0547b80ae0d0a32ea (diff) | |
| download | mediagoblin-e9c1b9381deb51f5b8b40580cea41a73eec65df7.tar.lz mediagoblin-e9c1b9381deb51f5b8b40580cea41a73eec65df7.tar.xz mediagoblin-e9c1b9381deb51f5b8b40580cea41a73eec65df7.zip | |
Video transcoding is now gstreamer directly instead of through arista
Diffstat (limited to 'mediagoblin/templates')
| -rw-r--r-- | mediagoblin/templates/mediagoblin/media_displays/video.html | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mediagoblin/templates/mediagoblin/media_displays/video.html b/mediagoblin/templates/mediagoblin/media_displays/video.html index 22b19240..bff9889a 100644 --- a/mediagoblin/templates/mediagoblin/media_displays/video.html +++ b/mediagoblin/templates/mediagoblin/media_displays/video.html @@ -1,16 +1,19 @@ {% extends 'mediagoblin/user_pages/media.html' %} {% block mediagoblin_media %} - <video width="640" height="" controls> + <video width="{{ media.media_data.video.width }}" + height="{{ media.media_data.video.height }}" controls="controls"> <source src="{{ request.app.public_store.file_url( - media['media_files']['medium']) }}" + media['media_files']['webm_640']) }}" type='video/webm; codecs="vp8, vorbis"' /> </video> {% if 'original' in media.media_files %} + <p> <a href="{{ request.app.public_store.file_url( media['media_files']['original']) }}"> {%- trans -%} Original {%- endtrans -%} </a> + </p> {% endif %} {% endblock %} |