Kieran/ffmpeg-the-third
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Bump to 5.1.1

Browse Source
This commit is contained in:
Polochon-street
2022-08-03 08:50:45 +02:00
parent 4275a8b0a2
commit b6b2311fcf
6 changed files with 60 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/codec/id.rs
View File

@ -13,7 +13,7 @@ pub enum Id {
// video codecs
MPEG1VIDEO,
MPEG2VIDEO,
#[cfg(feature = "ff_api_xvmc")]
#[cfg(all(feature = "ff_api_xvmc", not(feature = "ffmpeg_5_0")))]
MPEG2VIDEO_XVMC,
H261,
H263,
@ -602,6 +602,17 @@ pub enum Id {
ADPCM_IMA_ACORN,
#[cfg(feature = "ffmpeg_5_0")]
MSNSIREN,
#[cfg(feature = "ffmpeg_5_1")]
VBN,
#[cfg(feature = "ffmpeg_5_1")]
JPEGXL,
#[cfg(feature = "ffmpeg_5_1")]
QOI,
#[cfg(feature = "ffmpeg_5_1")]
PHM,
#[cfg(feature = "ffmpeg_5_1")]
DFPWM,
}
impl Id {
@ -625,7 +636,7 @@ impl From<AVCodecID> for Id {
/* video codecs */
AV_CODEC_ID_MPEG1VIDEO => Id::MPEG1VIDEO,
AV_CODEC_ID_MPEG2VIDEO => Id::MPEG2VIDEO,
#[cfg(feature = "ff_api_xvmc")]
#[cfg(all(feature = "ff_api_xvmc", not(feature = "ffmpeg_5_0")))]
AV_CODEC_ID_MPEG2VIDEO_XVMC => Id::MPEG2VIDEO_XVMC,
AV_CODEC_ID_H261 => Id::H261,
AV_CODEC_ID_H263 => Id::H263,
@ -1211,6 +1222,17 @@ impl From<AVCodecID> for Id {
AV_CODEC_ID_ADPCM_IMA_ACORN => Id::ADPCM_IMA_ACORN,
#[cfg(feature = "ffmpeg_5_0")]
AV_CODEC_ID_MSNSIREN => Id::MSNSIREN,
#[cfg(feature = "ffmpeg_5_1")]
AV_CODEC_ID_VBN => Id::VBN,
#[cfg(feature = "ffmpeg_5_1")]
AV_CODEC_ID_JPEGXL => Id::JPEGXL,
#[cfg(feature = "ffmpeg_5_1")]
AV_CODEC_ID_QOI => Id::QOI,
#[cfg(feature = "ffmpeg_5_1")]
AV_CODEC_ID_PHM => Id::PHM,
#[cfg(feature = "ffmpeg_5_1")]
AV_CODEC_ID_DFPWM => Id::DFPWM,
}
}
}
@ -1223,7 +1245,7 @@ impl From<Id> for AVCodecID {
/* video codecs */
Id::MPEG1VIDEO => AV_CODEC_ID_MPEG1VIDEO,
Id::MPEG2VIDEO => AV_CODEC_ID_MPEG2VIDEO,
#[cfg(feature = "ff_api_xvmc")]
#[cfg(all(feature = "ff_api_xvmc", not(feature = "ffmpeg_5_0")))]
Id::MPEG2VIDEO_XVMC => AV_CODEC_ID_MPEG2VIDEO_XVMC,
Id::H261 => AV_CODEC_ID_H261,
Id::H263 => AV_CODEC_ID_H263,
@ -1812,6 +1834,17 @@ impl From<Id> for AVCodecID {
Id::ADPCM_IMA_ACORN => AV_CODEC_ID_ADPCM_IMA_ACORN,
#[cfg(feature = "ffmpeg_5_0")]
Id::MSNSIREN => AV_CODEC_ID_MSNSIREN,
#[cfg(feature = "ffmpeg_5_1")]
Id::VBN => AV_CODEC_ID_VBN,
#[cfg(feature = "ffmpeg_5_1")]
Id::JPEGXL => AV_CODEC_ID_JPEGXL,
#[cfg(feature = "ffmpeg_5_1")]
Id::QOI => AV_CODEC_ID_QOI,
#[cfg(feature = "ffmpeg_5_1")]
Id::PHM => AV_CODEC_ID_PHM,
#[cfg(feature = "ffmpeg_5_1")]
Id::DFPWM => AV_CODEC_ID_DFPWM,
}
}
}