Fix libc::int64_t deprecation
This commit is contained in:
parent
3056975836
commit
587ec66592
@ -2,7 +2,7 @@ use std::ops::{Deref, DerefMut};
|
|||||||
|
|
||||||
use super::{audio, subtitle, video};
|
use super::{audio, subtitle, video};
|
||||||
use codec::Context;
|
use codec::Context;
|
||||||
use libc::{c_int, int64_t};
|
use libc::c_int;
|
||||||
use {media, Error, Rational};
|
use {media, Error, Rational};
|
||||||
|
|
||||||
pub struct Encoder(pub Context);
|
pub struct Encoder(pub Context);
|
||||||
@ -58,13 +58,13 @@ impl Encoder {
|
|||||||
|
|
||||||
pub fn set_bit_rate(&mut self, value: usize) {
|
pub fn set_bit_rate(&mut self, value: usize) {
|
||||||
unsafe {
|
unsafe {
|
||||||
(*self.as_mut_ptr()).bit_rate = value as int64_t;
|
(*self.as_mut_ptr()).bit_rate = value as i64;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn set_max_bit_rate(&mut self, value: usize) {
|
pub fn set_max_bit_rate(&mut self, value: usize) {
|
||||||
unsafe {
|
unsafe {
|
||||||
(*self.as_mut_ptr()).rc_max_rate = value as int64_t;
|
(*self.as_mut_ptr()).rc_max_rate = value as i64;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@ use std::ptr;
|
|||||||
|
|
||||||
use super::Delay;
|
use super::Delay;
|
||||||
use ffi::*;
|
use ffi::*;
|
||||||
use libc::{c_int, int64_t};
|
use libc::c_int;
|
||||||
use util::format;
|
use util::format;
|
||||||
use {frame, ChannelLayout, Error};
|
use {frame, ChannelLayout, Error};
|
||||||
|
|
||||||
@ -45,10 +45,10 @@ impl Context {
|
|||||||
unsafe {
|
unsafe {
|
||||||
let ptr = swr_alloc_set_opts(
|
let ptr = swr_alloc_set_opts(
|
||||||
ptr::null_mut(),
|
ptr::null_mut(),
|
||||||
dst_channel_layout.bits() as int64_t,
|
dst_channel_layout.bits() as i64,
|
||||||
dst_format.into(),
|
dst_format.into(),
|
||||||
dst_rate as c_int,
|
dst_rate as c_int,
|
||||||
src_channel_layout.bits() as int64_t,
|
src_channel_layout.bits() as i64,
|
||||||
src_format.into(),
|
src_format.into(),
|
||||||
src_rate as c_int,
|
src_rate as c_int,
|
||||||
0,
|
0,
|
||||||
|
@ -4,7 +4,7 @@ use std::slice;
|
|||||||
|
|
||||||
use super::Frame;
|
use super::Frame;
|
||||||
use ffi::*;
|
use ffi::*;
|
||||||
use libc::{c_int, c_ulonglong, int64_t};
|
use libc::{c_int, c_ulonglong};
|
||||||
use util::format;
|
use util::format;
|
||||||
use ChannelLayout;
|
use ChannelLayout;
|
||||||
|
|
||||||
@ -71,7 +71,7 @@ impl Audio {
|
|||||||
#[inline]
|
#[inline]
|
||||||
pub fn set_channel_layout(&mut self, value: ChannelLayout) {
|
pub fn set_channel_layout(&mut self, value: ChannelLayout) {
|
||||||
unsafe {
|
unsafe {
|
||||||
av_frame_set_channel_layout(self.as_mut_ptr(), value.bits() as int64_t);
|
av_frame_set_channel_layout(self.as_mut_ptr(), value.bits() as i64);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@ use std::ffi::CString;
|
|||||||
use std::mem;
|
use std::mem;
|
||||||
|
|
||||||
use ffi::*;
|
use ffi::*;
|
||||||
use libc::{c_int, c_void, int64_t};
|
use libc::{c_int, c_void};
|
||||||
use util::format;
|
use util::format;
|
||||||
use {ChannelLayout, Error, Rational};
|
use {ChannelLayout, Error, Rational};
|
||||||
|
|
||||||
@ -58,7 +58,7 @@ pub trait Settable: Target {
|
|||||||
check!(av_opt_set_int(
|
check!(av_opt_set_int(
|
||||||
self.as_mut_ptr(),
|
self.as_mut_ptr(),
|
||||||
name.as_ptr(),
|
name.as_ptr(),
|
||||||
value as int64_t,
|
value,
|
||||||
AV_OPT_SEARCH_CHILDREN
|
AV_OPT_SEARCH_CHILDREN
|
||||||
))
|
))
|
||||||
}
|
}
|
||||||
@ -137,7 +137,7 @@ pub trait Settable: Target {
|
|||||||
check!(av_opt_set_channel_layout(
|
check!(av_opt_set_channel_layout(
|
||||||
self.as_mut_ptr(),
|
self.as_mut_ptr(),
|
||||||
name.as_ptr(),
|
name.as_ptr(),
|
||||||
layout.bits() as int64_t,
|
layout.bits() as i64,
|
||||||
AV_OPT_SEARCH_CHILDREN
|
AV_OPT_SEARCH_CHILDREN
|
||||||
))
|
))
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user