Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use ffmpeg-the-third crate #28

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,6 @@ readme = "README.md"

[dependencies]
tracing = "0.1"
ffmpeg-next = { version = "6.0", features = [
"format",
"codec",
"software-resampling",
"software-scaling",
] }
url = "2"
ndarray = { version = "0.15", optional = true }
ffmpeg-the-third = "1.2.2"
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ media library without depending on ffmpeg.

First, install the `ffmpeg` libraries. The `ffmpeg-next` project has
[excellent instructions](https://github.com/zmwangx/rust-ffmpeg/wiki/Notes-on-building#dependencies)
on this (`video-rs` depends on the `ffmpeg-next` crate).
on this (`video-rs` depends on the `ffmpeg-the-third` crate).

Then, add the following to your dependencies in `Cargo.toml`:

Expand Down
2 changes: 1 addition & 1 deletion src/decode.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
extern crate ffmpeg_next as ffmpeg;
extern crate ffmpeg_the_third as ffmpeg;

use ffmpeg::codec::decoder::Video as AvDecoder;
use ffmpeg::codec::Context as AvContext;
Expand Down
2 changes: 1 addition & 1 deletion src/encode.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
extern crate ffmpeg_next as ffmpeg;
extern crate ffmpeg_the_third as ffmpeg;

use ffmpeg::codec::codec::Codec as AvCodec;
use ffmpeg::codec::encoder::video::Encoder as AvEncoder;
Expand Down
2 changes: 1 addition & 1 deletion src/error.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
extern crate ffmpeg_next as ffmpeg;
extern crate ffmpeg_the_third as ffmpeg;

use ffmpeg::Error as FfmpegError;

Expand Down
4 changes: 2 additions & 2 deletions src/ffi.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
extern crate ffmpeg_next as ffmpeg;
extern crate ffmpeg_the_third as ffmpeg;

#[cfg(feature = "ndarray")]
use ndarray::Array3;
Expand All @@ -15,7 +15,7 @@ use ffmpeg::util::format::Pixel;

use ffmpeg::ffi::*;

/// This function is similar to the existing bindings in ffmpeg-next like `output` and `output_as`,
/// This function is similar to the existing bindings in ffmpeg-the-third like `output` and `output_as`,
/// but does not assume that it is opening a file-like context. Instead, it opens a raw output,
/// without a file attached.
///
Expand Down
2 changes: 1 addition & 1 deletion src/frame.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
extern crate ffmpeg_next as ffmpeg;
extern crate ffmpeg_the_third as ffmpeg;

use ffmpeg::util::format::Pixel as AvPixel;
use ffmpeg::util::frame::Video as AvFrame;
Expand Down
2 changes: 1 addition & 1 deletion src/init.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
extern crate ffmpeg_next as ffmpeg;
extern crate ffmpeg_the_third as ffmpeg;

use crate::ffi::init_logging;

Expand Down
4 changes: 2 additions & 2 deletions src/io.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
extern crate ffmpeg_next as ffmpeg;
extern crate ffmpeg_the_third as ffmpeg;

use std::path::{Path, PathBuf};

Expand Down Expand Up @@ -401,7 +401,7 @@ pub enum Locator {
}

impl Locator {
/// Resolves the locator into a `PathBuf` for usage with `ffmpeg-next`.
/// Resolves the locator into a `PathBuf` for usage with `ffmpeg-the-third`.
fn resolve(&self) -> &Path {
match self {
Locator::Path(path) => path.as_path(),
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ pub use time::{Aligned, Time};
pub use frame::Frame;

/// Re-export inner `ffmpeg` library.
pub use ffmpeg_next as ffmpeg;
pub use ffmpeg_the_third as ffmpeg;
2 changes: 1 addition & 1 deletion src/mux.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
extern crate ffmpeg_next as ffmpeg;
extern crate ffmpeg_the_third as ffmpeg;

use std::collections::HashMap;

Expand Down
4 changes: 2 additions & 2 deletions src/options.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
extern crate ffmpeg_next as ffmpeg;
extern crate ffmpeg_the_third as ffmpeg;

use std::collections::HashMap;

Expand Down Expand Up @@ -87,7 +87,7 @@ impl Options<'_> {
Self(opts)
}

/// Convert back to ffmpeg native dictionary, which can be used with `ffmpeg_next` functions.
/// Convert back to ffmpeg native dictionary, which can be used with `ffmpeg_the_third` functions.
pub(super) fn to_dict(&self) -> AvDictionary {
self.0.clone()
}
Expand Down
2 changes: 1 addition & 1 deletion src/packet.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
extern crate ffmpeg_next as ffmpeg;
extern crate ffmpeg_the_third as ffmpeg;

use ffmpeg::codec::packet::Packet as AvPacket;
use ffmpeg::Rational as AvRational;
Expand Down
2 changes: 1 addition & 1 deletion src/stream.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
extern crate ffmpeg_next as ffmpeg;
extern crate ffmpeg_the_third as ffmpeg;

use ffmpeg::codec::Parameters as AvCodecParameters;
use ffmpeg::{Error as AvError, Rational as AvRational};
Expand Down
2 changes: 1 addition & 1 deletion src/time.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
extern crate ffmpeg_next as ffmpeg;
extern crate ffmpeg_the_third as ffmpeg;

use std::time::Duration;

Expand Down
Loading