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

Fix duplicate enum variant issues for FFmpeg 3.4

Browse Source
This commit is contained in:
Zhiming Wang
2020-06-11 23:18:47 +08:00
parent 3df1a1c209
commit 036c0e5b42
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/codec/id.rs
View File

@ -298,8 +298,6 @@ pub enum Id {
ADPCM_G722,
ADPCM_IMA_APC,
ADPCM_VIMA,
#[cfg(not(feature = "ffmpeg4"))]
VIMA,
ADPCM_AFC,
ADPCM_IMA_OKI,
@ -530,6 +528,9 @@ pub enum Id {
}
impl Id {
#[cfg(feature = "ff_api_vima_decoder")]
pub const VIMA: Id = Id::ADPCM_VIMA;
pub fn medium(&self) -> media::Type {
unsafe { media::Type::from(avcodec_get_type((*self).into())) }
}
@ -1353,8 +1354,6 @@ impl Into<AVCodecID> for Id {
Id::ADPCM_G722 => AV_CODEC_ID_ADPCM_G722,
Id::ADPCM_IMA_APC => AV_CODEC_ID_ADPCM_IMA_APC,
Id::ADPCM_VIMA => AV_CODEC_ID_ADPCM_VIMA,
#[cfg(not(feature = "ffmpeg4"))]
Id::VIMA => AV_CODEC_ID_VIMA,
Id::ADPCM_AFC => AV_CODEC_ID_ADPCM_AFC,
Id::ADPCM_IMA_OKI => AV_CODEC_ID_ADPCM_IMA_OKI,