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

format/context: do not use unstable to_cstring

Browse Source
This commit is contained in:
meh 2015-06-10 22:03:25 +02:00
parent 72965fc57a
commit 24af20b79d
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/format/context.rs
View File

@ -3,7 +3,7 @@ use std::ptr;
use std::path::Path; use std::path::Path;
use std::marker::PhantomData; use std::marker::PhantomData;
use libc::c_uint; use libc::{c_char, c_uint};
use ffi::*; use ffi::*;
use ::{Error, Dictionary, Codec, Stream, Format, Packet}; use ::{Error, Dictionary, Codec, Stream, Format, Packet};
@ -208,10 +208,15 @@ impl<'a> Iterator for PacketIter<'a> {
} }
} }
// XXX: use to_cstring when stable
fn from_path<T: AsRef<Path>>(path: &T) -> *const c_char {
CString::new(path.as_ref().as_os_str().to_str().unwrap()).unwrap().as_ptr()
}
pub fn open<T: AsRef<Path>>(path: &T) -> Result<Context, Error> { pub fn open<T: AsRef<Path>>(path: &T) -> Result<Context, Error> {
unsafe { unsafe {
let mut ps = ptr::null_mut(); let mut ps = ptr::null_mut();
let path = path.as_ref().as_os_str().to_cstring().unwrap().as_ptr(); let path = from_path(path);
let status = avformat_open_input(&mut ps, path, ptr::null_mut(), ptr::null_mut()); let status = avformat_open_input(&mut ps, path, ptr::null_mut(), ptr::null_mut());
match status { match status {
@ -232,7 +237,7 @@ pub fn open<T: AsRef<Path>>(path: &T) -> Result<Context, Error> {
pub fn open_with<T: AsRef<Path>>(path: &T, options: Dictionary) -> Result<Context, Error> { pub fn open_with<T: AsRef<Path>>(path: &T, options: Dictionary) -> Result<Context, Error> {
unsafe { unsafe {
let mut ps = ptr::null_mut(); let mut ps = ptr::null_mut();
let path = path.as_ref().as_os_str().to_cstring().unwrap().as_ptr(); let path = from_path(path);
let mut opts = options.take(); let mut opts = options.take();
let status = avformat_open_input(&mut ps, path, ptr::null_mut(), &mut opts); let status = avformat_open_input(&mut ps, path, ptr::null_mut(), &mut opts);
@ -257,7 +262,7 @@ pub fn open_as<T: AsRef<Path>>(path: &T, format: &Format) -> Result<Context, Err
if let &Format::Input(ref format) = format { if let &Format::Input(ref format) = format {
unsafe { unsafe {
let mut ps = ptr::null_mut(); let mut ps = ptr::null_mut();
let path = path.as_ref().as_os_str().to_cstring().unwrap().as_ptr(); let path = from_path(path);
let status = avformat_open_input(&mut ps, path, format.as_ptr(), ptr::null_mut()); let status = avformat_open_input(&mut ps, path, format.as_ptr(), ptr::null_mut());
match status { match status {
@ -283,7 +288,7 @@ pub fn open_as_with<T: AsRef<Path>>(path: &T, format: &Format, options: Dictiona
if let &Format::Input(ref format) = format { if let &Format::Input(ref format) = format {
unsafe { unsafe {
let mut ps = ptr::null_mut(); let mut ps = ptr::null_mut();
let path = path.as_ref().as_os_str().to_cstring().unwrap().as_ptr(); let path = from_path(path);
let mut opts = options.take(); let mut opts = options.take();
let status = avformat_open_input(&mut ps, path, format.as_ptr(), &mut opts); let status = avformat_open_input(&mut ps, path, format.as_ptr(), &mut opts);