diff --git a/Cargo.lock b/Cargo.lock
index c746375..702c6ca 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -84,18 +84,6 @@ dependencies = [
  "y4m",
 ]
 
-[[package]]
-name = "av-metrics-decoders"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "347427ab632003ebaba20436bb60584dd396f50d4c0093044dcd6191991274e3"
-dependencies = [
- "anyhow",
- "av-metrics",
- "ffmpeg-the-third",
- "y4m",
-]
-
 [[package]]
 name = "av-metrics-decoders"
 version = "0.3.1"
@@ -112,7 +100,7 @@ name = "av-metrics-tests"
 version = "0.0.1"
 dependencies = [
  "av-metrics",
- "av-metrics-decoders 0.2.3",
+ "av-metrics-decoders",
 ]
 
 [[package]]
@@ -120,7 +108,7 @@ name = "av-metrics-tool"
 version = "0.9.1"
 dependencies = [
  "av-metrics",
- "av-metrics-decoders 0.2.3",
+ "av-metrics-decoders",
  "clap",
  "console",
  "indicatif",
@@ -140,7 +128,7 @@ dependencies = [
  "itertools",
  "lazy_static",
  "lazycell",
-  "proc-macro2",
+ "proc-macro2",
  "quote",
  "regex",
  "rustc-hash",
@@ -624,12 +612,6 @@ version = "11.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
 
-[[package]]
-name = "peeking_take_while"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
-
 [[package]]
 name = "pkg-config"
 version = "0.3.26"
diff --git a/av_metrics_tests/Cargo.toml b/av_metrics_tests/Cargo.toml
index 02e1deb..7bf6f52 100644
--- a/av_metrics_tests/Cargo.toml
+++ b/av_metrics_tests/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 
 [dependencies]
 av-metrics = { version = "0.9", features = ["serde"] }
-av-metrics-decoders = "0.2.1"
+av-metrics-decoders = "0.3.1"
 
 [features]
 default = ["y4m"]
diff --git a/av_metrics_tests/src/lib.rs b/av_metrics_tests/src/lib.rs
index 5bec3e1..ea772f0 100644
--- a/av_metrics_tests/src/lib.rs
+++ b/av_metrics_tests/src/lib.rs
@@ -1,5 +1,7 @@
 #[cfg(test)]
 mod tests {
+    #![allow(unused_imports)]
+
     use av_metrics::video::ciede::{calculate_video_ciede, calculate_video_ciede_nosimd};
     use av_metrics::video::psnr::{calculate_video_apsnr, calculate_video_psnr};
     use av_metrics::video::psnr_hvs::calculate_video_psnr_hvs;
@@ -8,11 +10,13 @@ mod tests {
     use av_metrics_decoders::FfmpegDecoder;
     #[cfg(not(feature = "ffmpeg"))]
     use av_metrics_decoders::Y4MDecoder;
+    use std::fs::File;
+    use std::io::BufReader;
     use std::path::Path;
 
     #[cfg(not(feature = "ffmpeg"))]
-    fn get_decoder<P: AsRef<Path>>(input: P) -> Result<Y4MDecoder, String> {
-        Y4MDecoder::new(input)
+    fn get_decoder<P: AsRef<Path>>(input: P) -> Result<Y4MDecoder<BufReader<File>>, String> {
+        av_metrics_decoders::y4m::new_decoder_from_file(input)
     }
 
     #[cfg(feature = "ffmpeg")]
diff --git a/av_metrics_tool/Cargo.toml b/av_metrics_tool/Cargo.toml
index fb63458..9cda979 100644
--- a/av_metrics_tool/Cargo.toml
+++ b/av_metrics_tool/Cargo.toml
@@ -10,7 +10,7 @@ include = ["src/**/*", "LICENSE"]
 
 [dependencies]
 av-metrics = { version = "0.9", features = ["serde"] }
-av-metrics-decoders = "0.2.1"
+av-metrics-decoders = "0.3.1"
 clap = "4"
 console = "0.15.0"
 indicatif = "0.17.1"
diff --git a/av_metrics_tool/src/main.rs b/av_metrics_tool/src/main.rs
index 8f2baf0..4cbbe21 100644
--- a/av_metrics_tool/src/main.rs
+++ b/av_metrics_tool/src/main.rs
@@ -12,6 +12,8 @@ use indicatif::{ProgressBar, ProgressStyle};
 use serde::Serialize;
 use std::error::Error;
 use std::fs::File;
+#[cfg(not(feature = "ffmpeg"))]
+use std::io::BufReader;
 use std::io::{BufWriter, Stdout, Write};
 use std::path::Path;
 
@@ -166,8 +168,8 @@ impl InputType {
 }
 
 #[cfg(not(feature = "ffmpeg"))]
-pub fn get_decoder<P: AsRef<Path>>(input: P) -> Result<Y4MDecoder, String> {
-    Y4MDecoder::new(input)
+pub fn get_decoder<P: AsRef<Path>>(input: P) -> Result<Y4MDecoder<BufReader<File>>, String> {
+    av_metrics_decoders::y4m::new_decoder_from_file(input)
 }
 
 #[cfg(feature = "ffmpeg")]