X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=src%2Fdemuxers%2Favi.rs;fp=src%2Fdemuxers%2Favi.rs;h=034ef70e31e3f574f9bc3e882296399b51f561f7;hb=6611650404a13bca86a311afdc314406e725897c;hp=0b8ade0d5dc4b60114ca706105ffaddfdc6e019d;hpb=45e794c4181f03a75a9d7dfce4bc0bf9ce94b6b0;p=nihav.git diff --git a/src/demuxers/avi.rs b/src/demuxers/avi.rs index 0b8ade0..034ef70 100644 --- a/src/demuxers/avi.rs +++ b/src/demuxers/avi.rs @@ -68,6 +68,9 @@ impl<'a> Demux<'a> for AVIDemuxer<'a> { Ok(()) } + fn get_num_streams(&self) -> usize { self.dmx.get_num_streams() } + fn get_stream(&self, idx: usize) -> Option> { self.dmx.get_stream(idx) } + fn get_frame(&mut self) -> DemuxerResult { if !self.opened { return Err(NoSuchInput); } if self.movi_size == 0 { return Err(EOF); } @@ -280,7 +283,7 @@ fn parse_strf_vids(dmx: &mut AVIDemuxer, size: usize) -> DemuxerResult { let flip = height < 0; let format = if bitcount > 8 { RGB24_FORMAT } else { PAL8_FORMAT }; - let vhdr = NAVideoInfo::new(width, if flip { -height as u32 } else { height as u32}, flip, PAL8_FORMAT); + let vhdr = NAVideoInfo::new(width as usize, if flip { -height as usize } else { height as usize}, flip, PAL8_FORMAT); let vci = NACodecTypeInfo::Video(vhdr); let edata = dmx.read_extradata(size - 40)?; let cname = match register::find_codec_from_avi_fourcc(&compression) {