From 587ec6659242335c85144a862cab9bd8e03fd894 Mon Sep 17 00:00:00 2001 From: Zhiming Wang Date: Sun, 31 May 2020 13:34:24 +0800 Subject: [PATCH] Fix libc::int64_t deprecation --- src/codec/encoder/encoder.rs | 6 +++--- src/software/resampling/context.rs | 6 +++--- src/util/frame/audio.rs | 4 ++-- src/util/option/traits.rs | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/codec/encoder/encoder.rs b/src/codec/encoder/encoder.rs index edcd527..5d1fa8d 100644 --- a/src/codec/encoder/encoder.rs +++ b/src/codec/encoder/encoder.rs @@ -2,7 +2,7 @@ use std::ops::{Deref, DerefMut}; use super::{audio, subtitle, video}; use codec::Context; -use libc::{c_int, int64_t}; +use libc::c_int; use {media, Error, Rational}; pub struct Encoder(pub Context); @@ -58,13 +58,13 @@ impl Encoder { pub fn set_bit_rate(&mut self, value: usize) { 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) { unsafe { - (*self.as_mut_ptr()).rc_max_rate = value as int64_t; + (*self.as_mut_ptr()).rc_max_rate = value as i64; } } diff --git a/src/software/resampling/context.rs b/src/software/resampling/context.rs index ed0749c..43944eb 100644 --- a/src/software/resampling/context.rs +++ b/src/software/resampling/context.rs @@ -2,7 +2,7 @@ use std::ptr; use super::Delay; use ffi::*; -use libc::{c_int, int64_t}; +use libc::c_int; use util::format; use {frame, ChannelLayout, Error}; @@ -45,10 +45,10 @@ impl Context { unsafe { let ptr = swr_alloc_set_opts( ptr::null_mut(), - dst_channel_layout.bits() as int64_t, + dst_channel_layout.bits() as i64, dst_format.into(), dst_rate as c_int, - src_channel_layout.bits() as int64_t, + src_channel_layout.bits() as i64, src_format.into(), src_rate as c_int, 0, diff --git a/src/util/frame/audio.rs b/src/util/frame/audio.rs index 92a335f..126e44d 100644 --- a/src/util/frame/audio.rs +++ b/src/util/frame/audio.rs @@ -4,7 +4,7 @@ use std::slice; use super::Frame; use ffi::*; -use libc::{c_int, c_ulonglong, int64_t}; +use libc::{c_int, c_ulonglong}; use util::format; use ChannelLayout; @@ -71,7 +71,7 @@ impl Audio { #[inline] pub fn set_channel_layout(&mut self, value: ChannelLayout) { 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); } } diff --git a/src/util/option/traits.rs b/src/util/option/traits.rs index 80c43c2..dbb1431 100644 --- a/src/util/option/traits.rs +++ b/src/util/option/traits.rs @@ -4,7 +4,7 @@ use std::ffi::CString; use std::mem; use ffi::*; -use libc::{c_int, c_void, int64_t}; +use libc::{c_int, c_void}; use util::format; use {ChannelLayout, Error, Rational}; @@ -58,7 +58,7 @@ pub trait Settable: Target { check!(av_opt_set_int( self.as_mut_ptr(), name.as_ptr(), - value as int64_t, + value, AV_OPT_SEARCH_CHILDREN )) } @@ -137,7 +137,7 @@ pub trait Settable: Target { check!(av_opt_set_channel_layout( self.as_mut_ptr(), name.as_ptr(), - layout.bits() as int64_t, + layout.bits() as i64, AV_OPT_SEARCH_CHILDREN )) }