From 1cd6d0499b5ebaee7b5d01a794a7fe2aa318eb97 Mon Sep 17 00:00:00 2001 From: Zhiming Wang Date: Mon, 1 Jun 2020 13:17:08 +0800 Subject: [PATCH] Switch to my fork of ffmpeg-sys --- Cargo.toml | 121 +++++++++++++++++++++++++++-------------------------- src/lib.rs | 2 +- 2 files changed, 62 insertions(+), 61 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index e10b0dc..266a6cd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,78 +19,78 @@ default = ["ffmpeg4", "codec", "device", "filter", "format", "resampling", "soft ffmpeg4 = [] -static = ["ffmpeg-sys/static"] -build = ["static", "ffmpeg-sys/build"] +static = ["ffmpeg-sys-next/static"] +build = ["static", "ffmpeg-sys-next/build"] # licensing -build-license-gpl = ["ffmpeg-sys/build-license-gpl"] -build-license-nonfree = ["ffmpeg-sys/build-license-nonfree"] -build-license-version3 = ["ffmpeg-sys/build-license-version3"] +build-license-gpl = ["ffmpeg-sys-next/build-license-gpl"] +build-license-nonfree = ["ffmpeg-sys-next/build-license-nonfree"] +build-license-version3 = ["ffmpeg-sys-next/build-license-version3"] # misc -build-pic = ["ffmpeg-sys/build-pic"] -build-zlib = ["ffmpeg-sys/build-zlib"] +build-pic = ["ffmpeg-sys-next/build-pic"] +build-zlib = ["ffmpeg-sys-next/build-zlib"] # ssl -build-lib-gnutls = ["ffmpeg-sys/build-lib-gnutls"] -build-lib-openssl = ["ffmpeg-sys/build-lib-openssl"] +build-lib-gnutls = ["ffmpeg-sys-next/build-lib-gnutls"] +build-lib-openssl = ["ffmpeg-sys-next/build-lib-openssl"] # filters -build-lib-fontconfig = ["ffmpeg-sys/build-lib-fontconfig"] -build-lib-frei0r = ["ffmpeg-sys/build-lib-frei0r"] -build-lib-ladspa = ["ffmpeg-sys/build-lib-ladspa"] -build-lib-ass = ["ffmpeg-sys/build-lib-ass"] -build-lib-freetype = ["ffmpeg-sys/build-lib-freetype"] -build-lib-freebidi = ["ffmpeg-sys/build-lib-freebidi"] -build-lib-opencv = ["ffmpeg-sys/build-lib-opencv"] +build-lib-fontconfig = ["ffmpeg-sys-next/build-lib-fontconfig"] +build-lib-frei0r = ["ffmpeg-sys-next/build-lib-frei0r"] +build-lib-ladspa = ["ffmpeg-sys-next/build-lib-ladspa"] +build-lib-ass = ["ffmpeg-sys-next/build-lib-ass"] +build-lib-freetype = ["ffmpeg-sys-next/build-lib-freetype"] +build-lib-freebidi = ["ffmpeg-sys-next/build-lib-freebidi"] +build-lib-opencv = ["ffmpeg-sys-next/build-lib-opencv"] # encoders/decoders -build-lib-aacplus = ["ffmpeg-sys/build-lib-aacplus"] -build-lib-celt = ["ffmpeg-sys/build-lib-celt"] -build-lib-dcadec = ["ffmpeg-sys/build-lib-dcadec"] -build-lib-faac = ["ffmpeg-sys/build-lib-faac"] -build-lib-fdk-aac = ["ffmpeg-sys/build-lib-fdk-aac"] -build-lib-gsm = ["ffmpeg-sys/build-lib-gsm"] -build-lib-ilbc = ["ffmpeg-sys/build-lib-ilbc"] -build-lib-kvazaar = ["ffmpeg-sys/build-lib-kvazaar"] -build-lib-mp3lame = ["ffmpeg-sys/build-lib-mp3lame"] -build-lib-opencore-amrnb = ["ffmpeg-sys/build-lib-opencore-amrnb"] -build-lib-opencore-amrwb = ["ffmpeg-sys/build-lib-opencore-amrwb"] -build-lib-openh264 = ["ffmpeg-sys/build-lib-openh264"] -build-lib-openjpeg = ["ffmpeg-sys/build-lib-openjpeg"] -build-lib-opus = ["ffmpeg-sys/build-lib-opus"] -build-lib-schroedinger = ["ffmpeg-sys/build-lib-schroedinger"] -build-lib-shine = ["ffmpeg-sys/build-lib-shine"] -build-lib-snappy = ["ffmpeg-sys/build-lib-snappy"] -build-lib-speex = ["ffmpeg-sys/build-lib-speex"] -build-lib-stagefright-h264 = ["ffmpeg-sys/build-lib-stagefright-h264"] -build-lib-theora = ["ffmpeg-sys/build-lib-theora"] -build-lib-twolame = ["ffmpeg-sys/build-lib-twolame"] -build-lib-utvideo = ["ffmpeg-sys/build-lib-utvideo"] -build-lib-vo-aacenc = ["ffmpeg-sys/build-lib-vo-aacenc"] -build-lib-vo-amrwbenc = ["ffmpeg-sys/build-lib-vo-amrwbenc"] -build-lib-vorbis = ["ffmpeg-sys/build-lib-vorbis"] -build-lib-vpx = ["ffmpeg-sys/build-lib-vpx"] -build-lib-wavpack = ["ffmpeg-sys/build-lib-wavpack"] -build-lib-webp = ["ffmpeg-sys/build-lib-webp"] -build-lib-x264 = ["ffmpeg-sys/build-lib-x264"] -build-lib-x265 = ["ffmpeg-sys/build-lib-x265"] -build-lib-avs = ["ffmpeg-sys/build-lib-avs"] -build-lib-xvid = ["ffmpeg-sys/build-lib-xvid"] +build-lib-aacplus = ["ffmpeg-sys-next/build-lib-aacplus"] +build-lib-celt = ["ffmpeg-sys-next/build-lib-celt"] +build-lib-dcadec = ["ffmpeg-sys-next/build-lib-dcadec"] +build-lib-faac = ["ffmpeg-sys-next/build-lib-faac"] +build-lib-fdk-aac = ["ffmpeg-sys-next/build-lib-fdk-aac"] +build-lib-gsm = ["ffmpeg-sys-next/build-lib-gsm"] +build-lib-ilbc = ["ffmpeg-sys-next/build-lib-ilbc"] +build-lib-kvazaar = ["ffmpeg-sys-next/build-lib-kvazaar"] +build-lib-mp3lame = ["ffmpeg-sys-next/build-lib-mp3lame"] +build-lib-opencore-amrnb = ["ffmpeg-sys-next/build-lib-opencore-amrnb"] +build-lib-opencore-amrwb = ["ffmpeg-sys-next/build-lib-opencore-amrwb"] +build-lib-openh264 = ["ffmpeg-sys-next/build-lib-openh264"] +build-lib-openjpeg = ["ffmpeg-sys-next/build-lib-openjpeg"] +build-lib-opus = ["ffmpeg-sys-next/build-lib-opus"] +build-lib-schroedinger = ["ffmpeg-sys-next/build-lib-schroedinger"] +build-lib-shine = ["ffmpeg-sys-next/build-lib-shine"] +build-lib-snappy = ["ffmpeg-sys-next/build-lib-snappy"] +build-lib-speex = ["ffmpeg-sys-next/build-lib-speex"] +build-lib-stagefright-h264 = ["ffmpeg-sys-next/build-lib-stagefright-h264"] +build-lib-theora = ["ffmpeg-sys-next/build-lib-theora"] +build-lib-twolame = ["ffmpeg-sys-next/build-lib-twolame"] +build-lib-utvideo = ["ffmpeg-sys-next/build-lib-utvideo"] +build-lib-vo-aacenc = ["ffmpeg-sys-next/build-lib-vo-aacenc"] +build-lib-vo-amrwbenc = ["ffmpeg-sys-next/build-lib-vo-amrwbenc"] +build-lib-vorbis = ["ffmpeg-sys-next/build-lib-vorbis"] +build-lib-vpx = ["ffmpeg-sys-next/build-lib-vpx"] +build-lib-wavpack = ["ffmpeg-sys-next/build-lib-wavpack"] +build-lib-webp = ["ffmpeg-sys-next/build-lib-webp"] +build-lib-x264 = ["ffmpeg-sys-next/build-lib-x264"] +build-lib-x265 = ["ffmpeg-sys-next/build-lib-x265"] +build-lib-avs = ["ffmpeg-sys-next/build-lib-avs"] +build-lib-xvid = ["ffmpeg-sys-next/build-lib-xvid"] # protocols -build-lib-smbclient = ["ffmpeg-sys/build-lib-smbclient"] -build-lib-ssh = ["ffmpeg-sys/build-lib-ssh"] +build-lib-smbclient = ["ffmpeg-sys-next/build-lib-smbclient"] +build-lib-ssh = ["ffmpeg-sys-next/build-lib-ssh"] # components -codec = ["ffmpeg-sys/avcodec"] -device = ["ffmpeg-sys/avdevice", "format"] -filter = ["ffmpeg-sys/avfilter"] -format = ["ffmpeg-sys/avformat", "codec"] -resampling = ["ffmpeg-sys/avresample"] -postprocessing = ["ffmpeg-sys/postproc"] -software-resampling = ["ffmpeg-sys/swresample"] -software-scaling = ["ffmpeg-sys/swscale", "codec"] +codec = ["ffmpeg-sys-next/avcodec"] +device = ["ffmpeg-sys-next/avdevice", "format"] +filter = ["ffmpeg-sys-next/avfilter"] +format = ["ffmpeg-sys-next/avformat", "codec"] +resampling = ["ffmpeg-sys-next/avresample"] +postprocessing = ["ffmpeg-sys-next/postproc"] +software-resampling = ["ffmpeg-sys-next/swresample"] +software-scaling = ["ffmpeg-sys-next/swscale", "codec"] [dependencies] libc = "0.2" @@ -100,6 +100,7 @@ bitflags = "1.2" version = "0.12" optional = true -[dependencies.ffmpeg-sys] -version = "3.3" +[dependencies.ffmpeg-sys-next] +path = "../rust-ffmpeg-sys" +version = "4.2" default-features = false diff --git a/src/lib.rs b/src/lib.rs index 388a7ea..495a7c2 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -2,7 +2,7 @@ #[macro_use] extern crate bitflags; -pub extern crate ffmpeg_sys as sys; +pub extern crate ffmpeg_sys_next as sys; #[cfg(feature = "image")] extern crate image; extern crate libc;