struct DemuxerContext: Deduplicate into use imports.

memorysafety · Sep 25, 2023 · aad367a · aad367a
1 parent ed18663
commit aad367a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/tests/seek_stress.rs b/tests/seek_stress.rs
@@ -6,7 +6,7 @@
 #[path = "../tools/input"]
 mod input {
     mod annexb;
-    mod input;
+    pub mod input;
     mod ivf;
     mod section5;
 } // mod input
@@ -24,6 +24,7 @@ mod dav1d_cli_parse;
 use crate::dav1d_cli_parse::parse;
 use crate::dav1d_cli_parse::CLISettings;
 use crate::dav1d_cli_parse::REALTIME_DISABLE;
+use crate::input::input::DemuxerContext;
 use rav1d::include::dav1d::common::Dav1dDataProps;
 use rav1d::include::dav1d::common::Dav1dUserData;
 use rav1d::include::dav1d::data::Dav1dData;
@@ -67,7 +68,6 @@ use std::ffi::c_ulonglong;
 use std::ffi::c_void;
 
 extern "C" {
-    pub type DemuxerContext;
     fn input_open(
         c_out: *mut *mut DemuxerContext,
         name: *const c_char,

diff --git a/tools/dav1d.rs b/tools/dav1d.rs
@@ -5,7 +5,7 @@
 
 mod input {
     mod annexb;
-    mod input;
+    pub mod input;
     mod ivf;
     mod section5;
 } // mod input
@@ -22,6 +22,7 @@ use crate::dav1d_cli_parse::parse;
 use crate::dav1d_cli_parse::CLISettings;
 use crate::dav1d_cli_parse::REALTIME_CUSTOM;
 use crate::dav1d_cli_parse::REALTIME_DISABLE;
+use crate::input::input::DemuxerContext;
 use crate::output::output::MuxerContext;
 use libc::fclose;
 use libc::fflush;
@@ -81,7 +82,6 @@ use std::ffi::c_ulonglong;
 use std::ffi::c_void;
 
 extern "C" {
-    pub type DemuxerContext;
     fn input_open(
         c_out: *mut *mut DemuxerContext,
         name: *const c_char,