X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-indeo%2Fsrc%2Fcodecs%2Findeo4.rs;h=cc737024a17d8ed8d8a50be8b7e49dc2243dd586;hb=7f839ae7ac1eef6718bf508648ef9f287cc793bd;hp=c20732a92e05fc0a76c4c7c054a1bc738f87b4e7;hpb=6f2630992fe340ad1a122ec10c649f756e478185;p=nihav.git diff --git a/nihav-indeo/src/codecs/indeo4.rs b/nihav-indeo/src/codecs/indeo4.rs index c20732a..cc73702 100644 --- a/nihav-indeo/src/codecs/indeo4.rs +++ b/nihav-indeo/src/codecs/indeo4.rs @@ -76,13 +76,9 @@ impl IndeoXParser for Indeo4Parser { let slice_h; if br.read_bool()? { let idx = br.read(4)? as usize; - if idx < 15 { - slice_w = INDEO4_SLICE_SIZE_TAB[idx]; - slice_h = INDEO4_SLICE_SIZE_TAB[idx]; - } else { - slice_w = width; - slice_h = height; - } + slice_h = if idx < 15 { INDEO4_SLICE_SIZE_TAB[idx] } else { height }; + let idx = br.read(4)? as usize; + slice_w = if idx < 15 { INDEO4_SLICE_SIZE_TAB[idx] } else { width }; } else { slice_w = width; slice_h = height; @@ -426,7 +422,7 @@ impl Indeo4Decoder { fn new() -> Self { Indeo4Decoder { info: NACodecInfo::new_dummy(), - dec: IVIDecoder::new(), + dec: IVIDecoder::new(false), } } }