X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=src%2Fcodecs%2Freal%2Frv3040.rs;h=d1107ba0786a1a2378693c137636e14528d91f15;hb=aca8904163fb0a2bed0f5939097ddec3654d0551;hp=b2290e7907991bd81bf109210f4ac5f9219bac59;hpb=821c9deae6d089b2f19ee2fd98d51cf847573bc0;p=nihav.git diff --git a/src/codecs/real/rv3040.rs b/src/codecs/real/rv3040.rs index b2290e7..d1107ba 100644 --- a/src/codecs/real/rv3040.rs +++ b/src/codecs/real/rv3040.rs @@ -1,8 +1,8 @@ -use formats::YUV420_FORMAT; -use frame::{NABufferType, NAVideoInfo, NAVideoBuffer, FrameType, alloc_video_buffer}; -use codecs::{MV, ZERO_MV, DecoderError, DecoderResult, IPBShuffler}; -use io::bitreader::{BitReader,BitReaderMode}; -use io::intcode::*; +use crate::formats::YUV420_FORMAT; +use crate::frame::{NABufferType, NAVideoInfo, NAVideoBuffer, FrameType, alloc_video_buffer}; +use crate::codecs::{MV, ZERO_MV, DecoderError, DecoderResult, IPBShuffler}; +use crate::io::bitreader::{BitReader,BitReaderMode}; +use crate::io::intcode::*; use std::mem; use super::rv34codes::*; @@ -974,7 +974,7 @@ impl RV34Decoder { MBType::MBSkip | MBType::MBDirect => { if let (Some(ref fwdbuf), Some(ref bwdbuf)) = (self.ipbs.get_b_fwdref(), self.ipbs.get_b_bwdref()) { for y in 0..2 { - for x in 0..2 { + for x in 0..2 { let (mv_f, mv_b) = self.ref_mvi.get_mv(mb_x, mb_y, x, y, true).scale(sstate.trd, sstate.trb); do_mc_8x8(&self.dsp, buf, fwdbuf, mb_x, x, mb_y, y, mv_f, false); do_mc_8x8(&self.dsp, &mut self.avg_buf, bwdbuf, mb_x, x, mb_y, y, mv_b, true);