X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=src%2Fimgseq.rs;h=7de339b42b43fa0d04eaa25bb4bc32f8e2198fa4;hb=HEAD;hp=dad9c81a8c306391a4892c99eb4d865bc0880634;hpb=90683bc3ac9d2adbe4a6b7239e727a36bd513678;p=nihav-encoder.git diff --git a/src/imgseq.rs b/src/imgseq.rs index dad9c81..7de339b 100644 --- a/src/imgseq.rs +++ b/src/imgseq.rs @@ -172,7 +172,7 @@ impl<'a> ImgSeqDemuxerCreator<'a> { if let Ok(file) = File::open(fname.as_str()) { let mut file = BufReader::new(file); let vinfo = read_pnm_header(&mut file, self.pgmyuv)?; - let cinfo = NACodecInfo::new(if vinfo.format.model.is_yuv() { "rawvideo" } else { "rawvideo-ms" }, NACodecTypeInfo::Video(vinfo), None); + let cinfo = NACodecInfo::new("rawvideo", NACodecTypeInfo::Video(vinfo), None); let stream = NAStream::new(StreamType::Video, 0, cinfo, self.tb_num, self.tb_den, 0).into_ref(); return Ok(ImgSeqDemuxer::new(stream, self.start.unwrap_or(0), template, self.pgmyuv)); } @@ -184,7 +184,7 @@ impl<'a> ImgSeqDemuxerCreator<'a> { if let Ok(file) = File::open(fname.as_str()) { let mut file = BufReader::new(file); let vinfo = read_pnm_header(&mut file, self.pgmyuv)?; - let cinfo = NACodecInfo::new(if vinfo.format.model.is_yuv() { "rawvideo" } else { "rawvideo-ms" }, NACodecTypeInfo::Video(vinfo), None); + let cinfo = NACodecInfo::new("rawvideo", NACodecTypeInfo::Video(vinfo), None); let stream = NAStream::new(StreamType::Video, 0, cinfo, self.tb_num, self.tb_den, 0).into_ref(); return Ok(ImgSeqDemuxer::new(stream, new_start, template, self.pgmyuv)); } @@ -307,7 +307,7 @@ fn read_pnm_header(file: &mut BufReader, pgmyuv: bool) -> DemuxerResult