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

Update bitflags to 1.2 and fix namespacing

Browse Source
This commit is contained in:
Zhiming Wang 2020-06-01 13:06:34 +08:00
parent 3a8f366f60
commit 6644a91da4
No known key found for this signature in database
GPG Key ID: 5B58F95EC95965D8
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -94,7 +94,7 @@ software-scaling = ["ffmpeg-sys/swscale", "codec"]
[dependencies] [dependencies]
libc = "0.2" libc = "0.2"
bitflags = "0.9" bitflags = "1.2"
[dependencies.image] [dependencies.image]
version = "0.12" version = "0.12"

2
src/codec/audio.rs
View File

@ -121,7 +121,7 @@ impl ChannelLayoutIter {
} }
pub fn best(self, max: i32) -> ChannelLayout { pub fn best(self, max: i32) -> ChannelLayout {
self.fold(::channel_layout::MONO, |acc, cur| { self.fold(ChannelLayout::MONO, |acc, cur| {
if cur.channels() > acc.channels() && cur.channels() <= max { if cur.channels() > acc.channels() && cur.channels() <= max {
cur cur
} else { } else {

6
src/codec/packet/packet.rs
View File

@ -2,7 +2,7 @@ use std::marker::PhantomData;
use std::mem; use std::mem;
use std::slice; use std::slice;
use super::{flag, Borrow, Flags, Mut, Ref, SideData}; use super::{Borrow, Flags, Mut, Ref, SideData};
use ffi::*; use ffi::*;
use libc::c_int; use libc::c_int;
use {format, Error, Rational}; use {format, Error, Rational};
@ -99,12 +99,12 @@ impl Packet {
#[inline] #[inline]
pub fn is_key(&self) -> bool { pub fn is_key(&self) -> bool {
self.flags().contains(flag::KEY) self.flags().contains(Flags::KEY)
} }
#[inline] #[inline]
pub fn is_corrupt(&self) -> bool { pub fn is_corrupt(&self) -> bool {
self.flags().contains(flag::CORRUPT) self.flags().contains(Flags::CORRUPT)
} }
#[inline] #[inline]

2
src/software/mod.rs
View File

@ -28,7 +28,7 @@ pub fn converter(
output, output,
width, width,
height, height,
scaling::flag::FAST_BILINEAR, scaling::flag::Flags::FAST_BILINEAR,
) )
} }

8
src/software/scaling/extensions.rs
View File

@ -1,4 +1,4 @@
use super::{flag, Context, Flags}; use super::{Context, Flags};
use util::format; use util::format;
use {decoder, frame, Error, Picture}; use {decoder, frame, Error, Picture};
@ -25,7 +25,7 @@ impl<'a> Picture<'a> {
format, format,
self.width(), self.width(),
self.height(), self.height(),
flag::FAST_BILINEAR, Flags::FAST_BILINEAR,
) )
} }
} }
@ -53,7 +53,7 @@ impl frame::Video {
format, format,
self.width(), self.width(),
self.height(), self.height(),
flag::FAST_BILINEAR, Flags::FAST_BILINEAR,
) )
} }
} }
@ -81,7 +81,7 @@ impl decoder::Video {
format, format,
self.width(), self.width(),
self.height(), self.height(),
flag::FAST_BILINEAR, Flags::FAST_BILINEAR,
) )
} }
} }

2
src/util/frame/mod.rs
View File

@ -75,7 +75,7 @@ impl Frame {
#[inline] #[inline]
pub fn is_corrupt(&self) -> bool { pub fn is_corrupt(&self) -> bool {
self.flags().contains(flag::CORRUPT) self.flags().contains(Flags::CORRUPT)
} }
#[inline] #[inline]