avutil: move some stuff to util

sys/src/avutil/media.rs

@@ -1,18 +0,0 @@
-use libc::c_char;
-
-#[repr(C)]
-pub enum AVMediaType {
-	AVMEDIA_TYPE_UNKNOWN = -1,
-	AVMEDIA_TYPE_VIDEO,
-	AVMEDIA_TYPE_AUDIO,
-	AVMEDIA_TYPE_DATA,
-	AVMEDIA_TYPE_SUBTITLE,
-	AVMEDIA_TYPE_ATTACHMENT,
-	AVMEDIA_TYPE_NB
-}
-
-#[link(name = "avutil")]
-extern {
-	pub fn av_get_media_type_string(media_type: AVMediaType) -> *const c_char;
-}
-

sys/src/avutil/mod.rs

@@ -1,5 +1,3 @@
-use libc::{c_int, c_uint, c_char, int64_t};
-
 #[macro_use]
 mod macros;
 
@@ -97,10 +95,6 @@ pub use self::mathematics::AVRounding::*;
 mod md5;
 pub use self::md5::*;
 
-mod media;
-pub use self::media::*;
-pub use self::media::AVMediaType::*;
-
 mod mem;
 pub use self::mem::*;
 
@@ -117,9 +111,6 @@ pub use self::opt::AVOptionType::*;
 mod parseutils;
 pub use self::parseutils::*;
 
-mod picture;
-pub use self::picture::*;
-
 mod pixdesc;
 pub use self::pixdesc::*;
 
@@ -173,15 +164,7 @@ pub use self::twofish::*;
 mod xtea;
 pub use self::xtea::*;
 
-pub const AV_NOPTS_VALUE: int64_t    = 0x8000000000000000u64 as int64_t;
-pub const AV_TIME_BASE:   int64_t    = 1000000;
-pub const AV_TIME_BASE_Q: AVRational = AVRational { num: 1, den: AV_TIME_BASE as c_int };
-
-#[link(name = "avutil")]
-extern {
-	pub fn avutil_version() -> c_uint;
-	pub fn avutil_configuration() -> *const c_char;
-	pub fn avutil_license() -> *const c_char;
-
-	pub fn av_get_time_base_q() -> AVRational;
-}
+mod util;
+pub use self::util::*;
+pub use self::util::AVMediaType::*;
+pub use self::util::AVPictureType::*;

sys/src/avutil/picture.rs

@@ -1,19 +0,0 @@
-use libc::c_char;
-
-#[derive(Eq, PartialEq, Debug)]
-#[repr(C)]
-pub enum AVPictureType {
-	AV_PICTURE_TYPE_NONE = 0,
-	AV_PICTURE_TYPE_I,
-	AV_PICTURE_TYPE_P,
-	AV_PICTURE_TYPE_B,
-	AV_PICTURE_TYPE_S,
-	AV_PICTURE_TYPE_SI,
-	AV_PICTURE_TYPE_SP,
-	AV_PICTURE_TYPE_BI,
-}
-
-#[link(name = "avutil")]
-extern {
-	pub fn av_get_picture_type_char(pict_type: AVPictureType) -> c_char;
-}

sys/src/avutil/util.rs

@@ -0,0 +1,43 @@
+use libc::{c_int, c_uint, c_char, int64_t};
+use super::rational::AVRational;
+
+pub const AV_NOPTS_VALUE: int64_t    = 0x8000000000000000u64 as int64_t;
+pub const AV_TIME_BASE:   int64_t    = 1000000;
+pub const AV_TIME_BASE_Q: AVRational = AVRational { num: 1, den: AV_TIME_BASE as c_int };
+
+#[derive(Eq, PartialEq, Debug)]
+#[repr(C)]
+pub enum AVMediaType {
+	AVMEDIA_TYPE_UNKNOWN = -1,
+	AVMEDIA_TYPE_VIDEO,
+	AVMEDIA_TYPE_AUDIO,
+	AVMEDIA_TYPE_DATA,
+	AVMEDIA_TYPE_SUBTITLE,
+	AVMEDIA_TYPE_ATTACHMENT,
+	AVMEDIA_TYPE_NB
+}
+
+#[derive(Eq, PartialEq, Debug)]
+#[repr(C)]
+pub enum AVPictureType {
+	AV_PICTURE_TYPE_NONE = 0,
+	AV_PICTURE_TYPE_I,
+	AV_PICTURE_TYPE_P,
+	AV_PICTURE_TYPE_B,
+	AV_PICTURE_TYPE_S,
+	AV_PICTURE_TYPE_SI,
+	AV_PICTURE_TYPE_SP,
+	AV_PICTURE_TYPE_BI,
+}
+
+#[link(name = "avutil")]
+extern {
+	pub fn avutil_version() -> c_uint;
+	pub fn avutil_configuration() -> *const c_char;
+	pub fn avutil_license() -> *const c_char;
+
+	pub fn av_get_time_base_q() -> AVRational;
+
+	pub fn av_get_media_type_string(media_type: AVMediaType) -> *const c_char;
+	pub fn av_get_picture_type_char(pict_type: AVPictureType) -> c_char;
+}