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

codec/encoder/video: check the passed frame is in the proper format

Browse Source
This commit is contained in:
meh
2015-09-27 20:30:44 +02:00
parent e1e6e8cca7
commit 3ba84fb7ea
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/codec/encoder/video.rs
View File

@ -358,6 +358,10 @@ pub struct Encoder(pub Video);
impl Encoder { impl Encoder {
pub fn encode(&mut self, frame: &frame::Video, out: &mut Packet) -> Result<bool, Error> { pub fn encode(&mut self, frame: &frame::Video, out: &mut Packet) -> Result<bool, Error> {
unsafe { unsafe {
if self.format() != frame.format() {
return Err(Error::InvalidData);
}
let mut got: c_int = 0; let mut got: c_int = 0;
match avcodec_encode_video2(self.0.as_mut_ptr(), out.as_mut_ptr(), frame.as_ptr(), &mut got) { match avcodec_encode_video2(self.0.as_mut_ptr(), out.as_mut_ptr(), frame.as_ptr(), &mut got) {
@ -369,7 +373,12 @@ impl Encoder {
pub fn flush(&mut self, out: &mut Packet) -> Result<bool, Error> { pub fn flush(&mut self, out: &mut Packet) -> Result<bool, Error> {
unsafe { unsafe {
self.encode(&frame::Video::wrap(ptr::null_mut()), out) let mut got: c_int = 0;
match avcodec_encode_video2(self.0.as_mut_ptr(), out.as_mut_ptr(), ptr::null(), &mut got) {
e if e < 0 => Err(Error::from(e)),
_ => Ok(got != 0)
}
} }
} }