X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-commonfmt%2Fsrc%2Fdemuxers%2Fy4m.rs;h=9340421743c5fac3e39d3499d11b065f2a571fb9;hb=8e14efb001fac3fecb0cb56df8705d23fa2231a8;hp=93831e97f77aa819758bb56a44dd5880a3685118;hpb=886cde4847280b96e10d240c2f2d76abec121dc8;p=nihav.git diff --git a/nihav-commonfmt/src/demuxers/y4m.rs b/nihav-commonfmt/src/demuxers/y4m.rs index 93831e9..9340421 100644 --- a/nihav-commonfmt/src/demuxers/y4m.rs +++ b/nihav-commonfmt/src/demuxers/y4m.rs @@ -37,8 +37,7 @@ impl<'a> DemuxCore<'a> for Y4MDemuxer<'a> { }; validate!(&marker == b"FRAME\n"); let stream = strmgr.get_stream(0).unwrap(); - let (tb_num, tb_den) = stream.get_timebase(); - let ts = NATimeInfo::new(Some(self.frameno), None, None, tb_num, tb_den); + let ts = stream.make_ts(Some(self.frameno), None, None); let pkt = self.src.read_packet(stream, ts, true, self.frame_size)?; self.frameno += 1; Ok(pkt) @@ -91,7 +90,7 @@ impl<'a> Y4MDemuxer<'a> { let mut magic = [0u8; 10]; self.src.read_buf(&mut magic)?; validate!(&magic == b"YUV4MPEG2 "); - while let Ok((last, tok)) = read_token(&mut self.src) { + while let Ok((last, tok)) = read_token(self.src) { let (id, val) = tok.split_at(1); validate!(id.len() == 1); match id.bytes().next().unwrap() {