diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 0226988..08600cb 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,6 +1,13 @@ CHANGELOG ========= +6.1.0 +----- + +- Groundwork for pluggable backends added +- Video width/height now stored against the video model +- Removed enumchoicefield as a requirement (rip) + 6.0.0 ----- diff --git a/setup.py b/setup.py index 6a4914a..c74dbe3 100755 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ setup( name="wagtailvideos", - version="6.0.0", + version="6.1.0", description="A wagtail module for uploading and displaying videos in various codecs.", long_description=readme, author="Neon Jungle", diff --git a/wagtailvideos/transcoders/ffmpeg/ffmpeg.py b/wagtailvideos/transcoders/ffmpeg/ffmpeg.py index ecca50a..4d91c7d 100644 --- a/wagtailvideos/transcoders/ffmpeg/ffmpeg.py +++ b/wagtailvideos/transcoders/ffmpeg/ffmpeg.py @@ -1,11 +1,11 @@ import datetime +import json import logging import os import os.path import shutil import subprocess import tempfile -import json from typing import List, Optional, TypedDict from django.conf import settings