Merge branch 'master' into joar-skip_transcoding

Conflicts:
	mediagoblin/config_spec.ini

diff --cc mediagoblin/config_spec.ini
index 712d087e56459fd3adbb4d67562e8cfa0aa5bd9d,a9b0927bf87e04a55f909fbffc7139266e726829..44f6a68f9783dbb3b6e29a66af9b331f63ad5ddd
--- 1/mediagoblin/config_spec.ini
--- 2/mediagoblin/config_spec.ini
+++ b/mediagoblin/config_spec.ini
@@@ -97,16 -100,13 +100,20 @@@ vp8_quality = integer(default=8
  # Range: -0.1..1
  vorbis_quality = float(default=0.3)
  
+ # Autoplay the video when page is loaded?
+ auto_play = boolean(default=True)
+ 
 +[[skip_transcode]]
 +mime_types = string_list(default=list("video/webm"))
 +container_formats = string_list(default=list("Matroska"))
 +video_codecs = string_list(default=list("VP8 video"))
 +audio_codecs = string_list(default=list("Vorbis"))
 +dimensions_match = boolean(default=True)
 +
+ 
  [media_type:mediagoblin.media_types.audio]
  keep_original = boolean(default=True)
- # vorbisenc qualiy
+ # vorbisenc quality
  quality = float(default=0.3)
  create_spectrogram = boolean(default=True)
  spectrogram_fft_size = integer(default=4096)

diff --cc mediagoblin/media_types/video/processing.py
Simple merge

diff --cc mediagoblin/media_types/video/transcoders.py
Simple merge