Switch to my fork of ffmpeg-sys

This commit is contained in:
Zhiming Wang 2020-06-01 13:17:08 +08:00
parent 6644a91da4
commit 1cd6d0499b
No known key found for this signature in database
GPG Key ID: 5B58F95EC95965D8
2 changed files with 62 additions and 61 deletions

View File

@ -19,78 +19,78 @@ default = ["ffmpeg4", "codec", "device", "filter", "format", "resampling", "soft
ffmpeg4 = [] ffmpeg4 = []
static = ["ffmpeg-sys/static"] static = ["ffmpeg-sys-next/static"]
build = ["static", "ffmpeg-sys/build"] build = ["static", "ffmpeg-sys-next/build"]
# licensing # licensing
build-license-gpl = ["ffmpeg-sys/build-license-gpl"] build-license-gpl = ["ffmpeg-sys-next/build-license-gpl"]
build-license-nonfree = ["ffmpeg-sys/build-license-nonfree"] build-license-nonfree = ["ffmpeg-sys-next/build-license-nonfree"]
build-license-version3 = ["ffmpeg-sys/build-license-version3"] build-license-version3 = ["ffmpeg-sys-next/build-license-version3"]
# misc # misc
build-pic = ["ffmpeg-sys/build-pic"] build-pic = ["ffmpeg-sys-next/build-pic"]
build-zlib = ["ffmpeg-sys/build-zlib"] build-zlib = ["ffmpeg-sys-next/build-zlib"]
# ssl # ssl
build-lib-gnutls = ["ffmpeg-sys/build-lib-gnutls"] build-lib-gnutls = ["ffmpeg-sys-next/build-lib-gnutls"]
build-lib-openssl = ["ffmpeg-sys/build-lib-openssl"] build-lib-openssl = ["ffmpeg-sys-next/build-lib-openssl"]
# filters # filters
build-lib-fontconfig = ["ffmpeg-sys/build-lib-fontconfig"] build-lib-fontconfig = ["ffmpeg-sys-next/build-lib-fontconfig"]
build-lib-frei0r = ["ffmpeg-sys/build-lib-frei0r"] build-lib-frei0r = ["ffmpeg-sys-next/build-lib-frei0r"]
build-lib-ladspa = ["ffmpeg-sys/build-lib-ladspa"] build-lib-ladspa = ["ffmpeg-sys-next/build-lib-ladspa"]
build-lib-ass = ["ffmpeg-sys/build-lib-ass"] build-lib-ass = ["ffmpeg-sys-next/build-lib-ass"]
build-lib-freetype = ["ffmpeg-sys/build-lib-freetype"] build-lib-freetype = ["ffmpeg-sys-next/build-lib-freetype"]
build-lib-freebidi = ["ffmpeg-sys/build-lib-freebidi"] build-lib-freebidi = ["ffmpeg-sys-next/build-lib-freebidi"]
build-lib-opencv = ["ffmpeg-sys/build-lib-opencv"] build-lib-opencv = ["ffmpeg-sys-next/build-lib-opencv"]
# encoders/decoders # encoders/decoders
build-lib-aacplus = ["ffmpeg-sys/build-lib-aacplus"] build-lib-aacplus = ["ffmpeg-sys-next/build-lib-aacplus"]
build-lib-celt = ["ffmpeg-sys/build-lib-celt"] build-lib-celt = ["ffmpeg-sys-next/build-lib-celt"]
build-lib-dcadec = ["ffmpeg-sys/build-lib-dcadec"] build-lib-dcadec = ["ffmpeg-sys-next/build-lib-dcadec"]
build-lib-faac = ["ffmpeg-sys/build-lib-faac"] build-lib-faac = ["ffmpeg-sys-next/build-lib-faac"]
build-lib-fdk-aac = ["ffmpeg-sys/build-lib-fdk-aac"] build-lib-fdk-aac = ["ffmpeg-sys-next/build-lib-fdk-aac"]
build-lib-gsm = ["ffmpeg-sys/build-lib-gsm"] build-lib-gsm = ["ffmpeg-sys-next/build-lib-gsm"]
build-lib-ilbc = ["ffmpeg-sys/build-lib-ilbc"] build-lib-ilbc = ["ffmpeg-sys-next/build-lib-ilbc"]
build-lib-kvazaar = ["ffmpeg-sys/build-lib-kvazaar"] build-lib-kvazaar = ["ffmpeg-sys-next/build-lib-kvazaar"]
build-lib-mp3lame = ["ffmpeg-sys/build-lib-mp3lame"] build-lib-mp3lame = ["ffmpeg-sys-next/build-lib-mp3lame"]
build-lib-opencore-amrnb = ["ffmpeg-sys/build-lib-opencore-amrnb"] build-lib-opencore-amrnb = ["ffmpeg-sys-next/build-lib-opencore-amrnb"]
build-lib-opencore-amrwb = ["ffmpeg-sys/build-lib-opencore-amrwb"] build-lib-opencore-amrwb = ["ffmpeg-sys-next/build-lib-opencore-amrwb"]
build-lib-openh264 = ["ffmpeg-sys/build-lib-openh264"] build-lib-openh264 = ["ffmpeg-sys-next/build-lib-openh264"]
build-lib-openjpeg = ["ffmpeg-sys/build-lib-openjpeg"] build-lib-openjpeg = ["ffmpeg-sys-next/build-lib-openjpeg"]
build-lib-opus = ["ffmpeg-sys/build-lib-opus"] build-lib-opus = ["ffmpeg-sys-next/build-lib-opus"]
build-lib-schroedinger = ["ffmpeg-sys/build-lib-schroedinger"] build-lib-schroedinger = ["ffmpeg-sys-next/build-lib-schroedinger"]
build-lib-shine = ["ffmpeg-sys/build-lib-shine"] build-lib-shine = ["ffmpeg-sys-next/build-lib-shine"]
build-lib-snappy = ["ffmpeg-sys/build-lib-snappy"] build-lib-snappy = ["ffmpeg-sys-next/build-lib-snappy"]
build-lib-speex = ["ffmpeg-sys/build-lib-speex"] build-lib-speex = ["ffmpeg-sys-next/build-lib-speex"]
build-lib-stagefright-h264 = ["ffmpeg-sys/build-lib-stagefright-h264"] build-lib-stagefright-h264 = ["ffmpeg-sys-next/build-lib-stagefright-h264"]
build-lib-theora = ["ffmpeg-sys/build-lib-theora"] build-lib-theora = ["ffmpeg-sys-next/build-lib-theora"]
build-lib-twolame = ["ffmpeg-sys/build-lib-twolame"] build-lib-twolame = ["ffmpeg-sys-next/build-lib-twolame"]
build-lib-utvideo = ["ffmpeg-sys/build-lib-utvideo"] build-lib-utvideo = ["ffmpeg-sys-next/build-lib-utvideo"]
build-lib-vo-aacenc = ["ffmpeg-sys/build-lib-vo-aacenc"] build-lib-vo-aacenc = ["ffmpeg-sys-next/build-lib-vo-aacenc"]
build-lib-vo-amrwbenc = ["ffmpeg-sys/build-lib-vo-amrwbenc"] build-lib-vo-amrwbenc = ["ffmpeg-sys-next/build-lib-vo-amrwbenc"]
build-lib-vorbis = ["ffmpeg-sys/build-lib-vorbis"] build-lib-vorbis = ["ffmpeg-sys-next/build-lib-vorbis"]
build-lib-vpx = ["ffmpeg-sys/build-lib-vpx"] build-lib-vpx = ["ffmpeg-sys-next/build-lib-vpx"]
build-lib-wavpack = ["ffmpeg-sys/build-lib-wavpack"] build-lib-wavpack = ["ffmpeg-sys-next/build-lib-wavpack"]
build-lib-webp = ["ffmpeg-sys/build-lib-webp"] build-lib-webp = ["ffmpeg-sys-next/build-lib-webp"]
build-lib-x264 = ["ffmpeg-sys/build-lib-x264"] build-lib-x264 = ["ffmpeg-sys-next/build-lib-x264"]
build-lib-x265 = ["ffmpeg-sys/build-lib-x265"] build-lib-x265 = ["ffmpeg-sys-next/build-lib-x265"]
build-lib-avs = ["ffmpeg-sys/build-lib-avs"] build-lib-avs = ["ffmpeg-sys-next/build-lib-avs"]
build-lib-xvid = ["ffmpeg-sys/build-lib-xvid"] build-lib-xvid = ["ffmpeg-sys-next/build-lib-xvid"]
# protocols # protocols
build-lib-smbclient = ["ffmpeg-sys/build-lib-smbclient"] build-lib-smbclient = ["ffmpeg-sys-next/build-lib-smbclient"]
build-lib-ssh = ["ffmpeg-sys/build-lib-ssh"] build-lib-ssh = ["ffmpeg-sys-next/build-lib-ssh"]
# components # components
codec = ["ffmpeg-sys/avcodec"] codec = ["ffmpeg-sys-next/avcodec"]
device = ["ffmpeg-sys/avdevice", "format"] device = ["ffmpeg-sys-next/avdevice", "format"]
filter = ["ffmpeg-sys/avfilter"] filter = ["ffmpeg-sys-next/avfilter"]
format = ["ffmpeg-sys/avformat", "codec"] format = ["ffmpeg-sys-next/avformat", "codec"]
resampling = ["ffmpeg-sys/avresample"] resampling = ["ffmpeg-sys-next/avresample"]
postprocessing = ["ffmpeg-sys/postproc"] postprocessing = ["ffmpeg-sys-next/postproc"]
software-resampling = ["ffmpeg-sys/swresample"] software-resampling = ["ffmpeg-sys-next/swresample"]
software-scaling = ["ffmpeg-sys/swscale", "codec"] software-scaling = ["ffmpeg-sys-next/swscale", "codec"]
[dependencies] [dependencies]
libc = "0.2" libc = "0.2"
@ -100,6 +100,7 @@ bitflags = "1.2"
version = "0.12" version = "0.12"
optional = true optional = true
[dependencies.ffmpeg-sys] [dependencies.ffmpeg-sys-next]
version = "3.3" path = "../rust-ffmpeg-sys"
version = "4.2"
default-features = false default-features = false

View File

@ -2,7 +2,7 @@
#[macro_use] #[macro_use]
extern crate bitflags; extern crate bitflags;
pub extern crate ffmpeg_sys as sys; pub extern crate ffmpeg_sys_next as sys;
#[cfg(feature = "image")] #[cfg(feature = "image")]
extern crate image; extern crate image;
extern crate libc; extern crate libc;