Kieran/ffmpeg-the-third
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

util: move SampleFormat and PixelFormat to util::format

Browse Source
This commit is contained in:
meh
2015-05-13 23:36:08 +02:00
parent e48ee1e3eb
commit 5c402a1256
7 changed files with 767 additions and 764 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/util/frame/mod.rs
View File

@ -8,8 +8,7 @@ use std::ops::Deref;
use ffi::*;
use ::{Dictionary, Rational};
use ::util::pixel_format::PixelFormat;
use ::util::sample_format::SampleFormat;
use ::util::format;
use ::picture;
use ::color;
@ -163,13 +162,13 @@ impl Audio {
Audio(Frame::new())
}
pub fn format(&self) -> SampleFormat {
pub fn format(&self) -> format::Sample {
unsafe {
if (*self.ptr).format == -1 {
SampleFormat::None
format::Sample::None
}
else {
SampleFormat::from(mem::transmute::<_, AVSampleFormat>(((*self.ptr).format)))
format::Sample::from(mem::transmute::<_, AVSampleFormat>(((*self.ptr).format)))
}
}
}
@ -258,13 +257,13 @@ impl Video {
Video(Frame::new())
}
pub fn format(&self) -> PixelFormat {
pub fn format(&self) -> format::Pixel {
unsafe {
if (*self.ptr).format == -1 {
PixelFormat::None
format::Pixel::None
}
else {
PixelFormat::from(mem::transmute::<_, AVPixelFormat>(((*self.ptr).format)))
format::Pixel::from(mem::transmute::<_, AVPixelFormat>(((*self.ptr).format)))
}
}
}