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

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

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

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

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