Skip to content

Commit fff4653

Browse files
committed
Update the y4m dependency
1 parent 5cb34be commit fff4653

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ bitstream-io = "0.8"
5858
cfg-if = "0.1"
5959
clap = { version = "2", optional = true, default-features = false }
6060
libc = "0.2"
61-
y4m = { version = "0.5", optional = true }
61+
y4m = { version = "0.6", optional = true }
6262
backtrace = { version = "0.3", optional = true }
6363
num-traits = "0.2"
6464
num-derive = "0.3"

src/bin/decoder/y4m.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use crate::decoder::{DecodeError, Decoder, VideoDetails};
1515
use crate::Frame;
1616
use rav1e::prelude::*;
1717

18-
impl Decoder for y4m::Decoder<'_, Box<dyn Read>> {
18+
impl Decoder for y4m::Decoder<Box<dyn Read>> {
1919
fn get_video_details(&self) -> VideoDetails {
2020
let width = self.get_width();
2121
let height = self.get_height();
@@ -78,7 +78,7 @@ impl From<y4m::Error> for DecodeError {
7878
y4m::Error::EOF => DecodeError::EOF,
7979
y4m::Error::BadInput => DecodeError::BadInput,
8080
y4m::Error::UnknownColorspace => DecodeError::UnknownColorspace,
81-
y4m::Error::ParseError => DecodeError::ParseError,
81+
y4m::Error::ParseError(_) => DecodeError::ParseError,
8282
y4m::Error::IoError(e) => DecodeError::IoError(e),
8383
// Note that this error code has nothing to do with the system running out of memory,
8484
// it means the y4m decoder has exceeded its memory allocation limit.

src/bin/muxer/y4m.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use std::io::Write;
1313
use std::slice;
1414

1515
pub fn write_y4m_frame<T: Pixel>(
16-
y4m_enc: &mut y4m::Encoder<'_, Box<dyn Write>>, rec: &Frame<T>,
16+
y4m_enc: &mut y4m::Encoder<Box<dyn Write>>, rec: &Frame<T>,
1717
y4m_details: VideoDetails,
1818
) {
1919
let planes =

src/bin/rav1e.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ fn process_frame<T: Pixel, D: Decoder>(
132132
ctx: &mut Context<T>, output_file: &mut dyn Muxer, source: &mut Source<D>,
133133
pass1file: Option<&mut File>, pass2file: Option<&mut File>,
134134
buffer: &mut [u8], buf_pos: &mut usize,
135-
mut y4m_enc: Option<&mut y4m::Encoder<'_, Box<dyn Write>>>,
135+
mut y4m_enc: Option<&mut y4m::Encoder<Box<dyn Write>>>,
136136
metrics_cli: MetricsEnabled,
137137
) -> Result<Option<Vec<FrameSummary>>, CliError> {
138138
let y4m_details = source.input.get_video_details();
@@ -236,7 +236,7 @@ fn do_encode<T: Pixel, D: Decoder>(
236236
cfg: Config, verbose: Verbose, mut progress: ProgressInfo,
237237
output: &mut dyn Muxer, source: &mut Source<D>, mut pass1file: Option<File>,
238238
mut pass2file: Option<File>,
239-
mut y4m_enc: Option<y4m::Encoder<'_, Box<dyn Write>>>,
239+
mut y4m_enc: Option<y4m::Encoder<Box<dyn Write>>>,
240240
metrics_enabled: MetricsEnabled,
241241
) -> Result<(), CliError> {
242242
let mut ctx: Context<T> =

0 commit comments

Comments
 (0)