diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-08-21 12:39:31 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-08-21 12:39:38 -0500 |
| commit | f6497ce572c5dedb553a474023478625c5062a93 (patch) | |
| tree | b74a161659c1fb9e776ff921b9e5e9fcedf15cd6 /mediagoblin/templates | |
| parent | c62d174437445565b55b220396e7571a323a159c (diff) | |
| parent | 9de4fab437558d101e801a02240ca3772c590ace (diff) | |
| download | mediagoblin-f6497ce572c5dedb553a474023478625c5062a93.tar.lz mediagoblin-f6497ce572c5dedb553a474023478625c5062a93.tar.xz mediagoblin-f6497ce572c5dedb553a474023478625c5062a93.zip | |
Merge remote-tracking branch 'refs/remotes/rodney757/reprocessing'
Conflicts:
mediagoblin/processing/task.py
mediagoblin/submit/lib.py
Diffstat (limited to 'mediagoblin/templates')
| -rw-r--r-- | mediagoblin/templates/mediagoblin/media_displays/video.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mediagoblin/templates/mediagoblin/media_displays/video.html b/mediagoblin/templates/mediagoblin/media_displays/video.html index b0854c9f..5c52f9f0 100644 --- a/mediagoblin/templates/mediagoblin/media_displays/video.html +++ b/mediagoblin/templates/mediagoblin/media_displays/video.html @@ -62,11 +62,11 @@ </a> </li> {% endif %} - {% if 'webm_640' in media.media_files %} + {% if 'webm_video' in media.media_files %} <li> <a href="{{ request.app.public_store.file_url( - media.media_files.webm_640) }}"> - {%- trans %}WebM file (640p; VP8/Vorbis){% endtrans -%} + media.media_files.webm_video) }}"> + {%- trans %}WebM file (VP8/Vorbis){% endtrans -%} </a> </li> {% endif %} |