From 8fc2d47f1f6cde93554ba096b959b3bef3652ac1 Mon Sep 17 00:00:00 2001
From: metamuffin <metamuffin@disroot.org>
Date: Tue, 24 Oct 2023 21:59:06 +0200
Subject: i hate image.rs

---
 Cargo.lock            | 117 ++------------------------------------------------
 transcoder/Cargo.toml |   7 +--
 2 files changed, 7 insertions(+), 117 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 24c2fe4..e76170b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -67,18 +67,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "ahash"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd7d5a2cecb58716e47d67d5703a249964b14c7be1ec3cad3affc295b2d1c35d"
-dependencies = [
- "cfg-if",
- "once_cell",
- "version_check",
- "zerocopy",
-]
-
 [[package]]
 name = "aho-corasick"
 version = "1.1.2"
@@ -364,15 +352,6 @@ version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
-[[package]]
-name = "bitreader"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdd859c9d97f7c468252795b35aeccc412bdbb1e90ee6969c4fa6328272eaeff"
-dependencies = [
- "cfg-if",
-]
-
 [[package]]
 name = "bitstream-io"
 version = "1.7.0"
@@ -668,37 +647,6 @@ dependencies = [
  "cipher",
 ]
 
-[[package]]
-name = "dav1d"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ae9f7e5e360138ebcce87a7d6ae2c16f18af5b7bf3eb9f924c4e2fd2815f414"
-dependencies = [
- "bitflags 2.4.1",
- "dav1d-sys",
-]
-
-[[package]]
-name = "dav1d-sys"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4343783dfdb32772b601afd20ce915df07de1605e6085dfcc5068f64333121be"
-dependencies = [
- "libc",
- "pkg-config",
- "system-deps",
-]
-
-[[package]]
-name = "dcv-color-primitives"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "311d7bbd97a6b47fdf7f8583c63354ffd959f820544673fdafb25c2c7004a164"
-dependencies = [
- "paste",
- "wasm-bindgen",
-]
-
 [[package]]
 name = "deranged"
 version = "0.3.9"
@@ -826,15 +774,6 @@ dependencies = [
  "zune-inflate",
 ]
 
-[[package]]
-name = "fallible_collections"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a88c69768c0a15262df21899142bc6df9b9b823546d4b4b9a7bc2d6c448ec6fd"
-dependencies = [
- "hashbrown 0.13.2",
-]
-
 [[package]]
 name = "fastrand"
 version = "2.0.1"
@@ -1121,15 +1060,6 @@ version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
-[[package]]
-name = "hashbrown"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
-dependencies = [
- "ahash",
-]
-
 [[package]]
 name = "hashbrown"
 version = "0.14.2"
@@ -1279,17 +1209,16 @@ dependencies = [
 [[package]]
 name = "image"
 version = "0.24.7"
-source = "git+https://github.com/metamuffin/image-rs#89633ba32f9a9b9e44abc80de88040b91595f992"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711"
 dependencies = [
  "bytemuck",
  "byteorder",
  "color_quant",
- "dav1d",
- "dcv-color-primitives",
  "exr",
  "gif",
  "jpeg-decoder",
- "mp4parse",
+ "num-rational",
  "num-traits",
  "png",
  "qoi",
@@ -1740,20 +1669,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "mp4parse"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63a35203d3c6ce92d5251c77520acb2e57108c88728695aa883f70023624c570"
-dependencies = [
- "bitreader",
- "byteorder",
- "fallible_collections",
- "log",
- "num-traits",
- "static_assertions",
-]
-
 [[package]]
 name = "multer"
 version = "2.1.0"
@@ -2826,12 +2741,6 @@ dependencies = [
  "loom",
 ]
 
-[[package]]
-name = "static_assertions"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-
 [[package]]
 name = "strsim"
 version = "0.10.0"
@@ -3668,26 +3577,6 @@ dependencies = [
  "is-terminal",
 ]
 
-[[package]]
-name = "zerocopy"
-version = "0.7.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8db0ac2df3d060f81ec0380ccc5b71c2a7c092cfced671feeee1320e95559c87"
-dependencies = [
- "zerocopy-derive",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.7.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b6093bc6d5265ff40b479c834cdd25d8e20784781a2a29a8106327393d0a9ff"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.38",
-]
-
 [[package]]
 name = "zeroize"
 version = "1.6.0"
diff --git a/transcoder/Cargo.toml b/transcoder/Cargo.toml
index c4fa7e8..1416c10 100644
--- a/transcoder/Cargo.toml
+++ b/transcoder/Cargo.toml
@@ -9,9 +9,10 @@ jellybase = { path = "../base" }
 jellyremuxer = { path = "../remuxer" }
 log = { workspace = true }
 # TODO: change this back to crates.io when pr is merged
-image = { git = "https://github.com/metamuffin/image-rs", features = [
-    "avif-decoder",
-] }
+image = "0.24.7"
+# image = { git = "https://github.com/metamuffin/image-rs", features = [
+#     "avif-decoder",
+# ] }
 anyhow = "1.0.75"
 rgb = "0.8.36"
 rav1e = { version = "0.6.6", default-features = false, features = [
-- 
cgit v1.2.3-70-g09d2