*: use latest ffmpeg-sys using bindgen

* Update bindings to newest ffmpeg version for new ffmpeg-sys, which is mostly generated by bindgen
* Bring back removed feature flags
* Fix whitespace formating
* Remove prepended enum names to enum variants
* Remove unneeded allows
This commit is contained in:
Tadas Barzdžius
2017-07-08 18:00:27 +03:00
committed by meh
parent 8cf47c7ec6
commit 5ac0527bdc
41 changed files with 208 additions and 99 deletions

View File

@ -2,6 +2,7 @@ use std::ffi::CStr;
use std::str::from_utf8_unchecked;
use ffi::*;
use ffi::AVCodecID::*;
use ::util::media;
#[allow(non_camel_case_types)]
@ -458,6 +459,19 @@ pub enum Id {
MPEG4SYSTEMS,
FFMETADATA,
WRAPPED_AVFRAME,
PSD,
PIXLET,
SPEEDHQ,
CLEARVIDEO,
FMVC,
SCPR,
XPM,
AV1,
PCM_F16LE,
PCM_F24LE,
ATRAC3AL,
ATRAC3PAL,
}
impl Id {
@ -925,6 +939,18 @@ impl From<AVCodecID> for Id {
AV_CODEC_ID_MPEG4SYSTEMS => Id::MPEG4SYSTEMS,
AV_CODEC_ID_FFMETADATA => Id::FFMETADATA,
AV_CODEC_ID_WRAPPED_AVFRAME => Id::WRAPPED_AVFRAME,
AV_CODEC_ID_PSD => Id::PSD,
AV_CODEC_ID_PIXLET => Id::PIXLET,
AV_CODEC_ID_SPEEDHQ => Id::SPEEDHQ,
AV_CODEC_ID_CLEARVIDEO => Id::CLEARVIDEO,
AV_CODEC_ID_FMVC => Id::FMVC,
AV_CODEC_ID_SCPR => Id::SCPR,
AV_CODEC_ID_XPM => Id::XPM,
AV_CODEC_ID_AV1 => Id::AV1,
AV_CODEC_ID_PCM_F16LE => Id::PCM_F16LE,
AV_CODEC_ID_PCM_F24LE => Id::PCM_F24LE,
AV_CODEC_ID_ATRAC3AL => Id::ATRAC3AL,
AV_CODEC_ID_ATRAC3PAL => Id::ATRAC3PAL,
}
}
}
@ -1073,7 +1099,7 @@ impl Into<AVCodecID> for Id {
Id::ANM => AV_CODEC_ID_ANM,
Id::BINKVIDEO => AV_CODEC_ID_BINKVIDEO,
Id::IFF_ILBM => AV_CODEC_ID_IFF_ILBM,
Id::IFF_BYTERUN1 => AV_CODEC_ID_IFF_BYTERUN1,
Id::IFF_BYTERUN1 => AV_CODEC_ID_IFF_ILBM,
Id::KGV1 => AV_CODEC_ID_KGV1,
Id::YOP => AV_CODEC_ID_YOP,
Id::VP8 => AV_CODEC_ID_VP8,
@ -1111,7 +1137,7 @@ impl Into<AVCodecID> for Id {
Id::WEBP => AV_CODEC_ID_WEBP,
Id::HNM4_VIDEO => AV_CODEC_ID_HNM4_VIDEO,
Id::HEVC => AV_CODEC_ID_HEVC,
Id::H265 => AV_CODEC_ID_H265,
Id::H265 => AV_CODEC_ID_HEVC,
Id::FIC => AV_CODEC_ID_FIC,
Id::ALIAS_PIX => AV_CODEC_ID_ALIAS_PIX,
Id::BRENDER_PIX => AV_CODEC_ID_BRENDER_PIX,
@ -1383,6 +1409,19 @@ impl Into<AVCodecID> for Id {
Id::MPEG4SYSTEMS => AV_CODEC_ID_MPEG4SYSTEMS,
Id::FFMETADATA => AV_CODEC_ID_FFMETADATA,
Id::WRAPPED_AVFRAME => AV_CODEC_ID_WRAPPED_AVFRAME,
Id::PSD => AV_CODEC_ID_PSD,
Id::PIXLET => AV_CODEC_ID_PIXLET,
Id::SPEEDHQ => AV_CODEC_ID_SPEEDHQ,
Id::FMVC => AV_CODEC_ID_FMVC,
Id::CLEARVIDEO => AV_CODEC_ID_CLEARVIDEO,
Id::SCPR => AV_CODEC_ID_SCPR,
Id::XPM => AV_CODEC_ID_XPM,
Id::AV1 => AV_CODEC_ID_AV1,
Id::PCM_F16LE => AV_CODEC_ID_PCM_F16LE,
Id::PCM_F24LE => AV_CODEC_ID_PCM_F24LE,
Id::ATRAC3AL => AV_CODEC_ID_ATRAC3AL,
Id::ATRAC3PAL => AV_CODEC_ID_ATRAC3PAL,
}
}
}