diff --git a/converter/ffmpeg.py b/converter/ffmpeg.py index bdf4bd6..f060270 100644 --- a/converter/ffmpeg.py +++ b/converter/ffmpeg.py @@ -225,6 +225,9 @@ def __repr__(self): else: value = 'MediaStreamInfo(%s)' % d + if isinstance(value, unicode): + value = value.encode(console_encoding, 'replace') + return value @@ -410,7 +413,7 @@ def probe(self, fname, posters_as_video=True): p = self._spawn([self.ffprobe_path, '-show_format', '-show_streams', fname]) stdout_data, _ = p.communicate() - stdout_data = stdout_data.decode(console_encoding, errors='ignore') + stdout_data = stdout_data.decode(console_encoding, 'ignore') info.parse_ffprobe(stdout_data) if not info.format.format and len(info.streams) == 0: @@ -473,7 +476,7 @@ def on_sigalrm(*_): if not ret: break - ret = ret.decode(console_encoding, errors="ignore") + ret = ret.decode(console_encoding, "ignore") total_output += ret buf += ret if '\r' in buf: @@ -587,7 +590,7 @@ def thumbnails_by_interval(self, source, output_pattern, interval=1, _, stderr_data = p.communicate() if stderr_data == '': raise FFMpegError('Error while calling ffmpeg binary') - stderr_data.decode(console_encoding, errors="ignore") + stderr_data.decode(console_encoding, "ignore") def thumbnail(self, fname, time, outfile, size=None, quality=DEFAULT_JPEG_QUALITY): """ @@ -743,6 +746,6 @@ def thumbnails(self, fname, option_list): _, stderr_data = p.communicate() if stderr_data == '': raise FFMpegError('Error while calling ffmpeg binary') - stderr_data.decode(console_encoding, errors="ignore") + stderr_data.decode(console_encoding, "ignore") if any(not os.path.exists(option[1]) for option in option_list): raise FFMpegError('Error creating thumbnail: %s' % stderr_data)