move NAStream/NAPacket definitions into module frame

[nihav.git] / src / codecs / mod.rs

diff --git a/src/codecs/mod.rs b/src/codecs/mod.rs
index ff75af9fbd4a0c9532bc3d7f49e6b1b4b9d6573e..7edcf9eb2e6cdb60ea3292f269505eca78908ea3 100644 (file)
--- a/src/codecs/mod.rs
+++ b/src/codecs/mod.rs
@@ -3,7 +3,6 @@ pub mod indeo2;
 
 use std::rc::Rc;
 use frame::*;
-use demuxers::*;
 use io::byteio::ByteIOError;
 use io::bitreader::BitReaderError;
 use io::codebook::CodebookError;
@@ -43,14 +42,14 @@ pub trait NADecoder {
 }
 
 #[derive(Clone,Copy)]
-pub struct DemuxerInfo {
+pub struct DecoderInfo {
     name: &'static str,
     get_decoder: fn () -> Box<NADecoder>,
 }
 
-const DECODERS: &[DemuxerInfo] = &[
+const DECODERS: &[DecoderInfo] = &[
 #[cfg(feature="decoder_indeo2")]
-    DemuxerInfo { name: "indeo2", get_decoder: indeo2::get_decoder },
+    DecoderInfo { name: "indeo2", get_decoder: indeo2::get_decoder },
 ];
 
 pub fn find_decoder(name: &str) -> Option<fn () -> Box<NADecoder>> {