Merge branch 'multiple-qualities-frontend' into 'transcoding_progress'

Minor changes

See merge request !3

diff --cc mediagoblin/media_types/video/transcoders.py
index dbe56d9eb71f0703937d85e74b7cd3df613ed482,437b0bf8daf41cdec4f2c65852af96c4637682d9..75f5ef862b06085ebf0a8efd510de7b0842c6ecb
--- 1/mediagoblin/media_types/video/transcoders.py
--- 2/mediagoblin/media_types/video/transcoders.py
+++ b/mediagoblin/media_types/video/transcoders.py
@@@ -369,14 -367,9 +368,12 @@@ class VideoTranscoder(object)
                      percent_increment = percent - self.progress_percentage
                      self.progress_percentage = percent
                      if self._progress_callback:
 -                        self._progress_callback(percent_increment/self.num_of_resolutions)
 +                        if ACCEPTED_RESOLUTIONS[self.default_resolution] == self.destination_dimensions:
 +                            self._progress_callback(percent_increment/self.num_of_resolutions, percent)
 +                        else:
 +                            self._progress_callback(percent_increment/self.num_of_resolutions)
                      _log.info('{percent}% of {dest} resolution done..'
                                '.'.format(percent=percent, dest=self.destination_dimensions))
-                     _log.info('{0:.2f}% of all resolutions done'
-                               '...'.format(self.entry.transcoding_progress))
          elif message.type == Gst.MessageType.ERROR:
              _log.error('Got error: {0}'.format(message.parse_error()))
              self.dst_data = None