Migrate crates to Rust edition 2021 (#24)
* Migrate ffmpeg-sys to Edition 2021 * Migrate ffmpeg to Edition 2021 * Remove now-redundant imports * Reorder imports after edition migration
This commit is contained in:
@ -1,18 +1,18 @@
|
||||
use std::ops::{Deref, DerefMut};
|
||||
|
||||
#[cfg(not(feature = "ffmpeg_5_0"))]
|
||||
use ffi::*;
|
||||
use crate::ffi::*;
|
||||
#[cfg(not(feature = "ffmpeg_5_0"))]
|
||||
use libc::c_int;
|
||||
|
||||
use super::Opened;
|
||||
use codec::Context;
|
||||
use crate::codec::Context;
|
||||
#[cfg(not(feature = "ffmpeg_5_0"))]
|
||||
use frame;
|
||||
use util::format;
|
||||
use crate::frame;
|
||||
use crate::util::format;
|
||||
#[cfg(not(feature = "ffmpeg_5_0"))]
|
||||
use {packet, Error};
|
||||
use {AudioService, ChannelLayout};
|
||||
use crate::{packet, Error};
|
||||
use crate::{AudioService, ChannelLayout};
|
||||
|
||||
pub struct Audio(pub Opened);
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
use ffi::*;
|
||||
use crate::ffi::*;
|
||||
use libc::c_int;
|
||||
|
||||
bitflags! {
|
||||
|
@ -1,4 +1,4 @@
|
||||
use ffi::*;
|
||||
use crate::ffi::*;
|
||||
use libc::c_int;
|
||||
|
||||
bitflags! {
|
||||
|
@ -2,9 +2,9 @@ use std::ops::{Deref, DerefMut};
|
||||
use std::ptr;
|
||||
|
||||
use super::{Audio, Check, Conceal, Opened, Subtitle, Video};
|
||||
use codec::{traits, Context};
|
||||
use ffi::*;
|
||||
use {Dictionary, Discard, Error, Rational};
|
||||
use crate::codec::{traits, Context};
|
||||
use crate::ffi::*;
|
||||
use crate::{Dictionary, Discard, Error, Rational};
|
||||
|
||||
pub struct Decoder(pub Context);
|
||||
|
||||
|
@ -23,10 +23,10 @@ pub use self::opened::Opened;
|
||||
|
||||
use std::ffi::CString;
|
||||
|
||||
use codec::Context;
|
||||
use codec::Id;
|
||||
use ffi::*;
|
||||
use Codec;
|
||||
use crate::codec::Context;
|
||||
use crate::codec::Id;
|
||||
use crate::ffi::*;
|
||||
use crate::Codec;
|
||||
|
||||
pub fn new() -> Decoder {
|
||||
Context::new().decoder()
|
||||
|
@ -2,9 +2,9 @@ use std::ops::{Deref, DerefMut};
|
||||
use std::ptr;
|
||||
|
||||
use super::{Audio, Decoder, Subtitle, Video};
|
||||
use codec::{Context, Profile};
|
||||
use ffi::*;
|
||||
use {media, packet, Error, Frame, Rational};
|
||||
use crate::codec::{Context, Profile};
|
||||
use crate::ffi::*;
|
||||
use crate::{media, packet, Error, Frame, Rational};
|
||||
|
||||
pub struct Opened(pub Decoder);
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
use ffi::*;
|
||||
use crate::ffi::*;
|
||||
use libc::c_int;
|
||||
|
||||
bitflags! {
|
||||
|
@ -1,11 +1,11 @@
|
||||
use std::ops::{Deref, DerefMut};
|
||||
|
||||
use ffi::*;
|
||||
use crate::ffi::*;
|
||||
use libc::c_int;
|
||||
|
||||
use super::Opened;
|
||||
use codec::Context;
|
||||
use {packet, Error};
|
||||
use crate::codec::Context;
|
||||
use crate::{packet, Error};
|
||||
|
||||
pub struct Subtitle(pub Opened);
|
||||
|
||||
@ -13,7 +13,7 @@ impl Subtitle {
|
||||
pub fn decode<P: packet::Ref>(
|
||||
&mut self,
|
||||
packet: &P,
|
||||
out: &mut ::Subtitle,
|
||||
out: &mut crate::Subtitle,
|
||||
) -> Result<bool, Error> {
|
||||
unsafe {
|
||||
let mut got: c_int = 0;
|
||||
|
@ -1,19 +1,19 @@
|
||||
use std::ops::{Deref, DerefMut};
|
||||
|
||||
#[cfg(not(feature = "ffmpeg_5_0"))]
|
||||
use ffi::*;
|
||||
use crate::ffi::*;
|
||||
use libc::c_int;
|
||||
|
||||
use super::{slice, Opened};
|
||||
use codec::Context;
|
||||
use color;
|
||||
use crate::codec::Context;
|
||||
use crate::color;
|
||||
#[cfg(not(feature = "ffmpeg_5_0"))]
|
||||
use frame;
|
||||
use util::chroma;
|
||||
use util::format;
|
||||
use crate::frame;
|
||||
use crate::util::chroma;
|
||||
use crate::util::format;
|
||||
#[cfg(not(feature = "ffmpeg_5_0"))]
|
||||
use {packet, Error};
|
||||
use {FieldOrder, Rational};
|
||||
use crate::{packet, Error};
|
||||
use crate::{FieldOrder, Rational};
|
||||
|
||||
pub struct Video(pub Opened);
|
||||
|
||||
|
Reference in New Issue
Block a user