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

Revert 8199541 and guard with not(ffmpeg4)

Browse Source
This commit is contained in:
Zhiming Wang
2018-09-19 20:44:35 +00:00
parent 0e05c0bb29
commit a7eee9142f
5 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/codec/id.rs
View File

@ -298,6 +298,8 @@ pub enum Id {
ADPCM_G722,
ADPCM_IMA_APC,
ADPCM_VIMA,
#[cfg(not(feature = "ffmpeg4"))]
VIMA,
ADPCM_AFC,
ADPCM_IMA_OKI,
@ -1277,6 +1279,8 @@ 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,