demuxer: use new interface

[nihav.git] / src / test / dec_video.rs

diff --git a/src/test/dec_video.rs b/src/test/dec_video.rs
index 8576b11aed50037a087a52b8347a90fed7fde4d1..4094d3aa2d36d8911976c7dad0c34c1f64d8bb1e 100644 (file)
--- a/src/test/dec_video.rs
+++ b/src/test/dec_video.rs
@@ -108,8 +108,7 @@ pub fn test_file_decoding(demuxer: &str, name: &str, limit: Option<u64>,
     let mut file = File::open(name).unwrap();
     let mut fr = FileReader::new_read(&mut file);
     let mut br = ByteReader::new(&mut fr);
-    let mut dmx = dmx_f.new_demuxer(&mut br);
-    dmx.open().unwrap();
+    let mut dmx = create_demuxer(dmx_f, &mut br).unwrap();
 
     let mut decs: Vec<Option<Box<NADecoder>>> = Vec::new();
     for i in 0..dmx.get_num_streams() {
@@ -159,8 +158,7 @@ pub fn test_decode_audio(demuxer: &str, name: &str, limit: Option<u64>, audio_pf
     let mut file = File::open(name).unwrap();
     let mut fr = FileReader::new_read(&mut file);
     let mut br = ByteReader::new(&mut fr);
-    let mut dmx = dmx_f.new_demuxer(&mut br);
-    dmx.open().unwrap();
+    let mut dmx = create_demuxer(dmx_f, &mut br).unwrap();
 
     let mut decs: Vec<Option<Box<NADecoder>>> = Vec::new();
     for i in 0..dmx.get_num_streams() {