From 2e851575d827c6a48f587b9245148995edb8dfbb Mon Sep 17 00:00:00 2001 From: "Aode (lion)" Date: Mon, 28 Mar 2022 12:56:31 -0500 Subject: [PATCH] Support latest ffmpeg, imagemagick releases --- docker/object-storage/pict-rs.toml | 4 ++-- .../usr/lib/ImageMagick-7.1.0/config-Q16HDRI/policy.xml | 6 ++++-- .../usr/lib/ImageMagick-7.1.0/config-Q16HDRI/policy.xml | 6 ++++-- src/ffmpeg.rs | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/docker/object-storage/pict-rs.toml b/docker/object-storage/pict-rs.toml index 29c3c9d..430a7d4 100644 --- a/docker/object-storage/pict-rs.toml +++ b/docker/object-storage/pict-rs.toml @@ -5,5 +5,5 @@ addr = '0.0.0.0:8080' type = 's3_store' bucket_name = 'pict-rs' region = 'http://minio:9000' -access_key = '09ODZ3BGBISV4U92JLIM' -secret_key = 'j35YE9RrxhBP0dpiD5mmdXRXvPkEJR4k6zK12q3o' +access_key = 'XZEZ5B8Y3UCINU1KCVF6' +secret_key = 'cWbE5LcCK9YH8j1NvhOZocl+vH+b6T5Zvy3z+BZu' diff --git a/docker/object-storage/root/usr/lib/ImageMagick-7.1.0/config-Q16HDRI/policy.xml b/docker/object-storage/root/usr/lib/ImageMagick-7.1.0/config-Q16HDRI/policy.xml index 06166a9..9586799 100644 --- a/docker/object-storage/root/usr/lib/ImageMagick-7.1.0/config-Q16HDRI/policy.xml +++ b/docker/object-storage/root/usr/lib/ImageMagick-7.1.0/config-Q16HDRI/policy.xml @@ -8,12 +8,14 @@ + + + - - + diff --git a/docker/prod/root/usr/lib/ImageMagick-7.1.0/config-Q16HDRI/policy.xml b/docker/prod/root/usr/lib/ImageMagick-7.1.0/config-Q16HDRI/policy.xml index 06166a9..9586799 100644 --- a/docker/prod/root/usr/lib/ImageMagick-7.1.0/config-Q16HDRI/policy.xml +++ b/docker/prod/root/usr/lib/ImageMagick-7.1.0/config-Q16HDRI/policy.xml @@ -8,12 +8,14 @@ + + + - - + diff --git a/src/ffmpeg.rs b/src/ffmpeg.rs index 1ec9c6a..2206a8c 100644 --- a/src/ffmpeg.rs +++ b/src/ffmpeg.rs @@ -44,7 +44,7 @@ impl ThumbnailFormat { fn as_format(&self) -> &'static str { match self { - ThumbnailFormat::Jpeg => "singlejpeg", + ThumbnailFormat::Jpeg => "image2", // ThumbnailFormat::Webp => "webp", } }