From 05921ce5d8dba3c77605e22b6cf99753916e1fc4 Mon Sep 17 00:00:00 2001 From: meh Date: Tue, 12 May 2015 19:21:13 +0200 Subject: [PATCH] util/frame: handle unknown format case --- src/util/frame/mod.rs | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/util/frame/mod.rs b/src/util/frame/mod.rs index 5f618d8..bc13a50 100644 --- a/src/util/frame/mod.rs +++ b/src/util/frame/mod.rs @@ -141,7 +141,12 @@ impl Audio { pub fn format(&self) -> SampleFormat { unsafe { - SampleFormat::from(mem::transmute::<_, AVSampleFormat>(((*self.ptr).format))) + if (*self.ptr).format == -1 { + SampleFormat::None + } + else { + SampleFormat::from(mem::transmute::<_, AVSampleFormat>(((*self.ptr).format))) + } } } @@ -219,7 +224,12 @@ impl Video { pub fn format(&self) -> PixelFormat { unsafe { - PixelFormat::from(mem::transmute::<_, AVPixelFormat>(((*self.ptr).format))) + if (*self.ptr).format == -1 { + PixelFormat::None + } + else { + PixelFormat::from(mem::transmute::<_, AVPixelFormat>(((*self.ptr).format))) + } } }